Removing MasterWorkerProtocol dependencies