Work on protocol cleanup