more cleanup on ReplicatorCommunication