Remove more indirect references to the protocol package

Fix #756