Clean up the protocol interface