newprotocol -> protocol
cleanup debugging info