Remove cluster_service_discovery dependency