change the protocol, remove unused classes