diff --git a/source/client/src/clientHb.c b/source/client/src/clientHb.c
index f6c473333c..6c8878921b 100644
--- a/source/client/src/clientHb.c
+++ b/source/client/src/clientHb.c
@@ -389,6 +389,7 @@ static void hbStopThread() {
 }
 
 SAppHbMgr* appHbMgrInit(SAppInstInfo* pAppInstInfo, char *key) {
+  return NULL;
   hbMgrInit();
   SAppHbMgr* pAppHbMgr = malloc(sizeof(SAppHbMgr)); 
   if (pAppHbMgr == NULL) {
@@ -452,6 +453,7 @@ void appHbMgrCleanup(SAppHbMgr* pAppHbMgr) {
 }
 
 int hbMgrInit() {
+  return 0;
   // init once
   int8_t old = atomic_val_compare_exchange_8(&clientHbMgr.inited, 0, 1);
   if (old == 1) return 0;
@@ -469,6 +471,7 @@ int hbMgrInit() {
 }
 
 void hbMgrCleanUp() {
+  return;
   hbStopThread();
   
   // destroy all appHbMgr
@@ -506,6 +509,7 @@ int hbRegisterConnImpl(SAppHbMgr* pAppHbMgr, SClientHbKey connKey, SHbConnInfo *
 }
 
 int hbRegisterConn(SAppHbMgr* pAppHbMgr, int32_t connId, int64_t clusterId, int32_t hbType) {
+  return 0;
   SClientHbKey connKey = {.connId = connId, .hbType = HEARTBEAT_TYPE_QUERY};
   SHbConnInfo info = {0};
 
diff --git a/source/client/src/clientImpl.c b/source/client/src/clientImpl.c
index 1378533949..07fbf34793 100644
--- a/source/client/src/clientImpl.c
+++ b/source/client/src/clientImpl.c
@@ -119,7 +119,7 @@ TAOS *taos_connect_internal(const char *ip, const char *user, const char *pass,
     SAppInstInfo* p = calloc(1, sizeof(struct SAppInstInfo));
     p->mgmtEp       = epSet;
     p->pTransporter = openTransporter(user, secretEncrypt, tsNumOfCores);
-    p->pAppHbMgr = appHbMgrInit(p, key);
+    /*p->pAppHbMgr = appHbMgrInit(p, key);*/
     taosHashPut(appInfo.pInstMap, key, strlen(key), &p, POINTER_BYTES);
 
     pInst = &p;
@@ -691,8 +691,8 @@ int32_t tmq_ask_ep_cb(void* param, const SDataBuf* pMsg, int32_t code) {
   tDecodeSMqCMGetSubEpRsp(pMsg->pData, &rsp);
   int32_t sz = taosArrayGetSize(rsp.topics);
   // TODO: lock
-    printf("rsp epoch %ld sz %ld\n", rsp.epoch, rsp.topics->size);
-    printf("tmq epoch %ld sz %ld\n", tmq->epoch, tmq->clientTopics->size);
+    /*printf("rsp epoch %ld sz %ld\n", rsp.epoch, rsp.topics->size);*/
+    /*printf("tmq epoch %ld sz %ld\n", tmq->epoch, tmq->clientTopics->size);*/
   if (rsp.epoch != tmq->epoch) {
     //TODO
     if (tmq->clientTopics) taosArrayDestroy(tmq->clientTopics);
diff --git a/source/client/src/clientMain.c b/source/client/src/clientMain.c
index bdf3115981..b29813be03 100644
--- a/source/client/src/clientMain.c
+++ b/source/client/src/clientMain.c
@@ -78,7 +78,7 @@ void taos_close(TAOS* taos) {
   STscObj *pTscObj = (STscObj *)taos;
   tscDebug("0x%"PRIx64" try to close connection, numOfReq:%d", pTscObj->id, pTscObj->numOfReqs);
 
-  taosRemoveRef(clientConnRefPool, pTscObj->id);
+  /*taosRemoveRef(clientConnRefPool, pTscObj->id);*/
 }
 
 int taos_errno(TAOS_RES *tres) {
@@ -343,4 +343,4 @@ void taos_query_a(TAOS *taos, const char *sql, __taos_async_fn_t fp, void *param
 
 void taos_fetch_rows_a(TAOS_RES *res, __taos_async_fn_t fp, void *param) {
   // TODO
-}
\ No newline at end of file
+}
diff --git a/source/client/src/clientMsgHandler.c b/source/client/src/clientMsgHandler.c
index 24d1c0f03c..6f74c29650 100644
--- a/source/client/src/clientMsgHandler.c
+++ b/source/client/src/clientMsgHandler.c
@@ -76,7 +76,7 @@ int processConnectRsp(void* param, const SDataBuf* pMsg, int32_t code) {
 
   pTscObj->connType = HEARTBEAT_TYPE_QUERY;
 
-  hbRegisterConn(pTscObj->pAppInfo->pAppHbMgr, pConnect->connId, pConnect->clusterId, HEARTBEAT_TYPE_QUERY);
+  /*hbRegisterConn(pTscObj->pAppInfo->pAppHbMgr, pConnect->connId, pConnect->clusterId, HEARTBEAT_TYPE_QUERY);*/
 
   //  pRequest->body.resInfo.pRspMsg = pMsg->pData;
   tscDebug("0x%" PRIx64 " clusterId:%" PRId64 ", totalConn:%" PRId64, pRequest->requestId, pConnect->clusterId,
diff --git a/source/client/test/clientTests.cpp b/source/client/test/clientTests.cpp
index 3d57a5de1d..eec6a00405 100644
--- a/source/client/test/clientTests.cpp
+++ b/source/client/test/clientTests.cpp
@@ -53,6 +53,7 @@ TEST(testCase, driverInit_Test) {
 //  taos_init();
 }
 
+#if 0
 TEST(testCase, connect_Test) {
   TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
   if (pConn == NULL) {
@@ -562,7 +563,7 @@ TEST(testCase, insert_test) {
   taos_close(pConn);
 }
 
-#if 0
+#endif
 TEST(testCase, create_topic_Test) {
   TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
   assert(pConn != NULL);
@@ -607,12 +608,11 @@ TEST(testCase, tmq_subscribe_Test) {
   tmq_subscribe(tmq, topic_list);
 
   while (1) {
-    tmq_message_t* msg = tmq_consume_poll(tmq, 0);
-    printf("get msg\n");
+    tmq_message_t* msg = tmq_consume_poll(tmq, 1000);
+    //printf("get msg\n");
     //if (msg == NULL) break;
   }
 }
-#endif
 
 TEST(testCase, tmq_consume_Test) {
 }
@@ -620,6 +620,7 @@ TEST(testCase, tmq_consume_Test) {
 TEST(testCase, tmq_commit_TEST) {
 }
 
+#if 0
 TEST(testCase, projection_query_tables) {
   TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
   ASSERT_NE(pConn, nullptr);
@@ -732,5 +733,6 @@ TEST(testCase, agg_query_tables) {
   taos_free_result(pRes);
   taos_close(pConn);
 }
+#endif
 
 #pragma GCC diagnostic pop