diff --git a/examples/rust b/examples/rust
deleted file mode 160000
index 7ed7a97715..0000000000
--- a/examples/rust
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7ed7a97715388fa144718764d6bf20f9bfc29a12
diff --git a/source/client/src/clientImpl.c b/source/client/src/clientImpl.c
index 8cf4e8dc97..4917a01c55 100644
--- a/source/client/src/clientImpl.c
+++ b/source/client/src/clientImpl.c
@@ -1348,10 +1348,6 @@ int32_t doProcessMsgFromServer(void* param) {
     } else {
       memcpy(buf.pData, pMsg->pCont, pMsg->contLen);
     }
-
-    tscDebug("xxxxx malloc %p, message: %s, size:%d, code: %s, gtid: %s", buf.pData,
-             TMSG_INFO(pMsg->msgType), pMsg->contLen, tstrerror(pMsg->code), tbuf);
-    
   }
 
   pSendInfo->fp(pSendInfo->param, &buf, pMsg->code);
diff --git a/source/libs/scalar/inc/sclInt.h b/source/libs/scalar/inc/sclInt.h
index 36d2c5a49c..d423b92da7 100644
--- a/source/libs/scalar/inc/sclInt.h
+++ b/source/libs/scalar/inc/sclInt.h
@@ -45,8 +45,6 @@ typedef struct SScalarCtx {
 #define SCL_IS_CONST_CALC(_ctx) (NULL == (_ctx)->pBlockList)
 //#define SCL_IS_NULL_VALUE_NODE(_node) ((QUERY_NODE_VALUE == nodeType(_node)) && (TSDB_DATA_TYPE_NULL == ((SValueNode *)_node)->node.resType.type) && (((SValueNode *)_node)->placeholderNo <= 0))
 #define SCL_IS_NULL_VALUE_NODE(_node) ((QUERY_NODE_VALUE == nodeType(_node)) && (TSDB_DATA_TYPE_NULL == ((SValueNode *)_node)->node.resType.type))
-#define SCL_IS_COMPARISON_OPERATOR(_opType) ((_opType) >= OP_TYPE_GREATER_THAN && (_opType) < OP_TYPE_IS_NOT_UNKNOWN)
-#define SCL_DOWNGRADE_DATETYPE(_type) ((_type) == TSDB_DATA_TYPE_BIGINT || TSDB_DATA_TYPE_DOUBLE == (_type) || (_type) == TSDB_DATA_TYPE_UBIGINT)
 
 #define sclFatal(...)  qFatal(__VA_ARGS__)
 #define sclError(...)  qError(__VA_ARGS__)
diff --git a/source/libs/scalar/src/scalar.c b/source/libs/scalar/src/scalar.c
index f08677084d..d0c5a76f4b 100644
--- a/source/libs/scalar/src/scalar.c
+++ b/source/libs/scalar/src/scalar.c
@@ -9,7 +9,6 @@
 #include "scalar.h"
 #include "tudf.h"
 #include "ttime.h"
-#include "tcompare.h"
 
 int32_t scalarGetOperatorParamNum(EOperatorType type) {
   if (OP_TYPE_IS_NULL == type || OP_TYPE_IS_NOT_NULL == type || OP_TYPE_IS_TRUE == type || OP_TYPE_IS_NOT_TRUE == type
@@ -220,82 +219,6 @@ void sclFreeParamList(SScalarParam *param, int32_t paramNum) {
   taosMemoryFree(param);
 }
 
-void sclDowngradeValueType(SValueNode *valueNode) {
-  switch (valueNode->node.resType.type) {
-    case TSDB_DATA_TYPE_BIGINT: {
-      int8_t i8 = valueNode->datum.i;
-      if (i8 == valueNode->datum.i) {
-        valueNode->node.resType.type = TSDB_DATA_TYPE_TINYINT;
-        *(int8_t*)&valueNode->typeData = i8;
-        break;
-      }
-      int16_t i16 = valueNode->datum.i;
-      if (i16 == valueNode->datum.i) {
-        valueNode->node.resType.type = TSDB_DATA_TYPE_SMALLINT;
-        *(int16_t*)&valueNode->typeData = i16;
-        break;
-      }
-      int32_t i32 = valueNode->datum.i;
-      if (i32 == valueNode->datum.i) {
-        valueNode->node.resType.type = TSDB_DATA_TYPE_INT;
-        *(int32_t*)&valueNode->typeData = i32;
-        break;
-      }
-      break;
-    }
-    case TSDB_DATA_TYPE_UBIGINT:{
-      uint8_t u8 = valueNode->datum.i;
-      if (u8 == valueNode->datum.i) {
-        int8_t i8 = valueNode->datum.i;
-        if (i8 == valueNode->datum.i) {
-          valueNode->node.resType.type = TSDB_DATA_TYPE_TINYINT;
-          *(int8_t*)&valueNode->typeData = i8;
-        } else {
-          valueNode->node.resType.type = TSDB_DATA_TYPE_UTINYINT;
-          *(uint8_t*)&valueNode->typeData = u8;
-        }
-        break;
-      }
-      uint16_t u16 = valueNode->datum.i;
-      if (u16 == valueNode->datum.i) {
-        int16_t i16 = valueNode->datum.i;
-        if (i16 == valueNode->datum.i) {
-          valueNode->node.resType.type = TSDB_DATA_TYPE_SMALLINT;
-          *(int16_t*)&valueNode->typeData = i16;
-        } else {
-          valueNode->node.resType.type = TSDB_DATA_TYPE_USMALLINT;
-          *(uint16_t*)&valueNode->typeData = u16;
-        }
-        break;
-      }
-      uint32_t u32 = valueNode->datum.i;
-      if (u32 == valueNode->datum.i) {
-        int32_t i32 = valueNode->datum.i;
-        if (i32 == valueNode->datum.i) {
-          valueNode->node.resType.type = TSDB_DATA_TYPE_INT;
-          *(int32_t*)&valueNode->typeData = i32;
-        } else {
-          valueNode->node.resType.type = TSDB_DATA_TYPE_UINT;
-          *(uint32_t*)&valueNode->typeData = u32;
-        }
-        break;
-      }
-      break;
-    }
-    case TSDB_DATA_TYPE_DOUBLE: {
-      float f = valueNode->datum.d;
-      if (FLT_EQUAL(f, valueNode->datum.d)) {
-        valueNode->node.resType.type = TSDB_DATA_TYPE_FLOAT;
-        *(float*)&valueNode->typeData = f;
-        break;
-      }
-      break;
-    }
-    default:
-      break;
-  }
-}
-
 int32_t sclInitParam(SNode* node, SScalarParam *param, SScalarCtx *ctx, int32_t *rowNum) {
   switch (nodeType(node)) {
     case QUERY_NODE_LEFT_VALUE: {
@@ -308,7 +231,6 @@ int32_t sclInitParam(SNode* node, SScalarParam *param, SScalarCtx *ctx, int32_t
 
       ASSERT(param->columnData == NULL);
       param->numOfRows = 1;
-     
       /*int32_t code = */sclCreateColumnInfoData(&valueNode->node.resType, 1, param);
       if (TSDB_DATA_TYPE_NULL == valueNode->node.resType.type || valueNode->isNull) {
         colDataAppendNULL(param->columnData, 0);
@@ -750,10 +672,6 @@ EDealRes sclRewriteNonConstOperator(SNode** pNode, SScalarCtx *ctx) {
         return DEAL_RES_ERROR;
       }
     }
-
-    if (SCL_IS_COMPARISON_OPERATOR(node->opType) && SCL_DOWNGRADE_DATETYPE(valueNode->node.resType.type)) {
-      sclDowngradeValueType(valueNode);
-    }    
   }
 
   if (node->pRight && (QUERY_NODE_VALUE == nodeType(node->pRight))) {
@@ -771,10 +689,6 @@ EDealRes sclRewriteNonConstOperator(SNode** pNode, SScalarCtx *ctx) {
         return DEAL_RES_ERROR;
       }
     }
-
-    if (SCL_IS_COMPARISON_OPERATOR(node->opType) && SCL_DOWNGRADE_DATETYPE(valueNode->node.resType.type)) {
-      sclDowngradeValueType(valueNode);
-    }    
   }
 
   if (node->pRight && (QUERY_NODE_NODE_LIST == nodeType(node->pRight))) {
diff --git a/source/libs/scheduler/src/schRemote.c b/source/libs/scheduler/src/schRemote.c
index 5c993b3831..8c9003a9b2 100644
--- a/source/libs/scheduler/src/schRemote.c
+++ b/source/libs/scheduler/src/schRemote.c
@@ -389,7 +389,6 @@ int32_t schHandleCallback(void *param, SDataBuf *pMsg, int32_t rspCode) {
 
 _return:
 
-  qDebug("xxxxx free %p", pMsg->pData);
   taosMemoryFreeClear(pMsg->pData);
 
   qDebug("end to handle rsp msg, type:%s, handle:%p, code:%s", TMSG_INFO(pMsg->msgType), pMsg->handle,
@@ -403,7 +402,6 @@ int32_t schHandleDropCallback(void *param, SDataBuf *pMsg, int32_t code) {
   qDebug("QID:0x%" PRIx64 ",TID:0x%" PRIx64 " drop task rsp received, code:0x%x", pParam->queryId, pParam->taskId,
          code);
   if (pMsg) {
-    qDebug("xxxxx free %p", pMsg->pData);
     taosMemoryFree(pMsg->pData);       
   }
   return TSDB_CODE_SUCCESS;
@@ -416,8 +414,6 @@ int32_t schHandleLinkBrokenCallback(void *param, SDataBuf *pMsg, int32_t code) {
   qDebug("handle %p is broken", pMsg->handle);
 
   if (head->isHbParam) {
-
-    qDebug("xxxxx free %p", pMsg->pData);
     taosMemoryFree(pMsg->pData);
     
     SSchHbCallbackParam *hbParam = (SSchHbCallbackParam *)param;
@@ -460,7 +456,6 @@ int32_t schHandleHbCallback(void *param, SDataBuf *pMsg, int32_t code) {
 _return:
 
   tFreeSSchedulerHbRsp(&rsp);
-  qDebug("xxxxx free %p", pMsg->pData);
   taosMemoryFree(pMsg->pData);
   SCH_RET(code);
 }
diff --git a/tools/taos-tools b/tools/taos-tools
deleted file mode 160000
index 3c7dafeea3..0000000000
--- a/tools/taos-tools
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3c7dafeea3e558968165b73bee0f51024898e3da