removed cluster_service_discovery references