Some protocol cleanup

And two mostly useless classes removed.