cleaned up for merge with cluster_repo