further cleanup attempts on ReplicatorCommunication