diff --git a/pom.xml b/pom.xml
index 4aa8c968931..04d44061077 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@
         <!-- grpc dependencies -->
         <dependency>
             <groupId>io.grpc</groupId>
-            <artifactId>grpc-netty</artifactId>
+            <artifactId>grpc-netty-shaded</artifactId>
             <version>${grpc.version}</version>
         </dependency>
         <dependency>
@@ -140,11 +140,13 @@
             <artifactId>grpc-services</artifactId>
             <version>${grpc.version}</version>
         </dependency>
+        <!--
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-tcnative-boringssl-static</artifactId>
             <version>${netty.tcnative.version}</version>
         </dependency>
+        -->
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-testing</artifactId>
@@ -175,7 +177,7 @@
                 </exclusion>
                 <exclusion>
                     <groupId>io.grpc</groupId>
-                    <artifactId>grpc-grpclb</artifactId>
+                    <artifactId>grpc-netty</artifactId>
                 </exclusion>
             </exclusions>
             <version>${jetcd.version}</version>
@@ -442,18 +444,25 @@
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
                             </transformers>
                             <relocations>
+                                <!--
                                 <relocation>
                                     <pattern>io.grpc</pattern>
                                     <shadedPattern>org.tikv.shade.io.grpc</shadedPattern>
+                                    <excludes>
+                                        <exclude>netty.shaded.*</exclude>
+                                    </excludes>
                                 </relocation>
+                                -->
                                 <relocation>
                                     <pattern>com.google</pattern>
                                     <shadedPattern>org.tikv.shade.com.google</shadedPattern>
                                 </relocation>
+                                <!--
                                 <relocation>
                                     <pattern>io.netty</pattern>
                                     <shadedPattern>org.tikv.shade.io.netty</shadedPattern>
                                 </relocation>
+                                -->
                                 <relocation>
                                     <pattern>io.opencensus</pattern>
                                     <shadedPattern>org.tikv.shade.io.opencensus</shadedPattern>
diff --git a/src/main/java/org/tikv/common/DefaultHostMapping.java b/src/main/java/org/tikv/common/DefaultHostMapping.java
index 2e53fff37fd..a1d843588fe 100644
--- a/src/main/java/org/tikv/common/DefaultHostMapping.java
+++ b/src/main/java/org/tikv/common/DefaultHostMapping.java
@@ -20,15 +20,10 @@
 import com.google.common.annotations.Beta;
 import io.etcd.jetcd.ByteSequence;
 import io.etcd.jetcd.Client;
-import io.etcd.jetcd.KeyValue;
-import io.etcd.jetcd.kv.GetResponse;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ExecutionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -52,7 +47,7 @@ private ByteSequence hostToNetworkMappingKey(String host) {
 
   @Beta
   private String getMappedHostFromPD(String host) {
-    ByteSequence hostKey = hostToNetworkMappingKey(host);
+    /*ByteSequence hostKey = hostToNetworkMappingKey(host);
     for (int i = 0; i < 5; i++) {
       CompletableFuture<GetResponse> future = etcdClient.getKVClient().get(hostKey);
       try {
@@ -72,7 +67,8 @@ private String getMappedHostFromPD(String host) {
         break;
       }
     }
-    return host;
+    return host;*/
+    return "";
   }
 
   public URI getMappedURI(URI uri) {
diff --git a/src/main/java/org/tikv/common/PDClient.java b/src/main/java/org/tikv/common/PDClient.java
index d86363f3c66..70c6ba9bc32 100644
--- a/src/main/java/org/tikv/common/PDClient.java
+++ b/src/main/java/org/tikv/common/PDClient.java
@@ -378,7 +378,7 @@ public TiConfiguration.ReplicaRead getReplicaRead() {
 
   @Override
   public void close() throws InterruptedException {
-    etcdClient.close();
+    // etcdClient.close();
     if (service != null) {
       service.shutdownNow();
     }
@@ -635,16 +635,16 @@ private void initCluster() {
     GetMembersResponse resp = null;
     List<URI> pdAddrs = getConf().getPdAddrs();
     this.pdAddrs = pdAddrs;
-    this.etcdClient =
-        Client.builder()
-            .endpoints(pdAddrs)
-            .executorService(
-                Executors.newCachedThreadPool(
-                    new ThreadFactoryBuilder()
-                        .setNameFormat("etcd-conn-manager-pool-%d")
-                        .setDaemon(true)
-                        .build()))
-            .build();
+    this.etcdClient = null;
+    /*Client.builder()
+    .endpoints(pdAddrs)
+    .executorService(
+        Executors.newCachedThreadPool(
+            new ThreadFactoryBuilder()
+                .setNameFormat("etcd-conn-manager-pool-%d")
+                .setDaemon(true)
+                .build()))
+    .build();*/
     this.hostMapping =
         Optional.ofNullable(getConf().getHostMapping())
             .orElseGet(() -> new DefaultHostMapping(this.etcdClient, conf.getNetworkMappingName()));
diff --git a/src/main/java/org/tikv/common/util/ChannelFactory.java b/src/main/java/org/tikv/common/util/ChannelFactory.java
index a517473089f..4ee59896587 100644
--- a/src/main/java/org/tikv/common/util/ChannelFactory.java
+++ b/src/main/java/org/tikv/common/util/ChannelFactory.java
@@ -16,10 +16,10 @@
 package org.tikv.common.util;
 
 import io.grpc.ManagedChannel;
-import io.grpc.netty.GrpcSslContexts;
-import io.grpc.netty.NettyChannelBuilder;
-import io.netty.handler.ssl.SslContext;
-import io.netty.handler.ssl.SslContextBuilder;
+import io.grpc.netty.shaded.io.grpc.netty.GrpcSslContexts;
+import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
+import io.grpc.netty.shaded.io.netty.handler.ssl.SslContext;
+import io.grpc.netty.shaded.io.netty.handler.ssl.SslContextBuilder;
 import java.io.File;
 import java.net.URI;
 import java.util.concurrent.ConcurrentHashMap;