[#70915820] Cleans up protocol based on hacking/experience