Cleaned up some code in the ClassReplicaCreator class