Merged in wire protocol remove functionality