remove more references to other protocol modules.