refactor(protocol): cleanup (#730)