Remove references to read_mac_secret and write_mac_secret