Remove supprotocol handling