1 files changed, 3 insertions, 27 deletions
diff --git a/src/core/tsi/alts_transport_security.cc b/src/core/tsi/alts_transport_security.cc
index dac23bbf7a..5a1494ae5c 100644
--- a/src/core/tsi/alts_transport_security.cc
+++ b/src/core/tsi/alts_transport_security.cc
@@ -18,48 +18,24 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/tsi/alts_transport_security.h"
-
 #include <string.h>
 
+#include "src/core/tsi/alts_transport_security.h"
+
 static alts_shared_resource g_alts_resource;
 
 alts_shared_resource* alts_get_shared_resource(void) {
   return &g_alts_resource;
 }
 
-static void grpc_tsi_alts_wait_for_cq_drain() {
-  gpr_mu_lock(&g_alts_resource.mu);
-  while (!g_alts_resource.is_cq_drained) {
-    gpr_cv_wait(&g_alts_resource.cv, &g_alts_resource.mu,
-                gpr_inf_future(GPR_CLOCK_REALTIME));
-  }
-  gpr_mu_unlock(&g_alts_resource.mu);
-}
-
-void grpc_tsi_alts_signal_for_cq_destroy() {
-  gpr_mu_lock(&g_alts_resource.mu);
-  g_alts_resource.is_cq_drained = true;
-  gpr_cv_signal(&g_alts_resource.cv);
-  gpr_mu_unlock(&g_alts_resource.mu);
-}
-
 void grpc_tsi_alts_init() {
   g_alts_resource.channel = nullptr;
-  g_alts_resource.cq = nullptr;
-  g_alts_resource.is_cq_drained = false;
   gpr_mu_init(&g_alts_resource.mu);
-  gpr_cv_init(&g_alts_resource.cv);
 }
 
 void grpc_tsi_alts_shutdown() {
-  if (g_alts_resource.cq != nullptr) {
-    grpc_completion_queue_shutdown(g_alts_resource.cq);
-    grpc_tsi_alts_wait_for_cq_drain();
-    grpc_completion_queue_destroy(g_alts_resource.cq);
+  if (g_alts_resource.channel != nullptr) {
     grpc_channel_destroy(g_alts_resource.channel);
-    g_alts_resource.thread.Join();
   }
-  gpr_cv_destroy(&g_alts_resource.cv);
   gpr_mu_destroy(&g_alts_resource.mu);
 }