P2P: Clean up protocol interface