diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/TransportClient.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/TransportClient.java
index d320ff61a41..22b957f4bbd 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/TransportClient.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/TransportClient.java
@@ -136,11 +136,6 @@ public class TransportClient extends AbstractClient {
         modules.add(new ClientTransportActionModule());
         modules.add(new ClientTransportModule());
 
-        // disabled, still having problems with jgroups acting just as client
-        if (settings.getAsBoolean("discovery.enabled", true) && false) {
-            modules.add(new TransportClientClusterModule(settings));
-        }
-
         injector = modules.createInjector();
 
         injector.getInstance(TransportService.class).start();
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/TransportClientClusterModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/TransportClientClusterModule.java
deleted file mode 100644
index 399668f5a8b..00000000000
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/TransportClientClusterModule.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to Elastic Search and Shay Banon under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. Elastic Search licenses this
- * file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.client.transport;
-
-import org.elasticsearch.cluster.ClusterService;
-import org.elasticsearch.cluster.service.InternalClusterService;
-import org.elasticsearch.common.inject.AbstractModule;
-import org.elasticsearch.common.logging.Loggers;
-import org.elasticsearch.common.settings.NoClassSettingsException;
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.discovery.DiscoveryModule;
-
-/**
- * @author kimchy (Shay Banon)
- */
-public class TransportClientClusterModule extends AbstractModule {
-
-    private final Settings settings;
-
-    public TransportClientClusterModule(Settings settings) {
-        this.settings = settings;
-    }
-
-    @Override protected void configure() {
-        try {
-            new DiscoveryModule(settings).configure(binder());
-            bind(ClusterService.class).to(InternalClusterService.class).asEagerSingleton();
-            bind(TransportClientClusterService.class).asEagerSingleton();
-        } catch (NoClassSettingsException e) {
-            // that's fine, no actual implementation for discovery
-        } catch (Exception e) {
-            Loggers.getLogger(getClass(), settings).warn("Failed to load discovery", e);
-        }
-    }
-}