Move legacy wire protocol features