More cleanup with respect to Replicas