Remove legacy code for old protocols