More cleanup to no longer reference replicator