ReplicatorCommunication, cleanup #1