diff --git a/include/libs/executor/executor.h b/include/libs/executor/executor.h
index bfcaeeb59c..9d09861b8e 100644
--- a/include/libs/executor/executor.h
+++ b/include/libs/executor/executor.h
@@ -37,9 +37,6 @@ typedef struct SReadHandle {
   void*   mnd;
   SMsgCb* pMsgCb;
 
-  /* XXXXXXXXXXXXXXXXXXXX */
-  int32_t deleteQuery;
-  /* XXXXXXXXXXXXXXXXXXXX */
 //  int8_t  initTsdbReader;
   bool    tqReader;
 } SReadHandle;
diff --git a/source/libs/executor/inc/executorimpl.h b/source/libs/executor/inc/executorimpl.h
index 8f61a67658..84dd87b9e7 100644
--- a/source/libs/executor/inc/executorimpl.h
+++ b/source/libs/executor/inc/executorimpl.h
@@ -151,10 +151,6 @@ typedef struct SExecTaskInfo {
   jmp_buf          env;                  // jump to this position when error happens.
   EOPTR_EXEC_MODEL execModel;            // operator execution model [batch model|stream model]
   struct SOperatorInfo* pRoot;
-
-  /* XXXXXXXXXXXXXXXXXXXX */
-  SReadHandle* pHandle;
-  /* XXXXXXXXXXXXXXXXXXXX */
 } SExecTaskInfo;
 
 enum {
diff --git a/source/libs/executor/src/executorMain.c b/source/libs/executor/src/executorMain.c
index 1a5dd00120..007c61afc3 100644
--- a/source/libs/executor/src/executorMain.c
+++ b/source/libs/executor/src/executorMain.c
@@ -139,29 +139,8 @@ int32_t qExecTask(qTaskInfo_t tinfo, SSDataBlock** pRes, uint64_t* useconds) {
   qDebug("%s execTask is launched", GET_TASKID(pTaskInfo));
 
   int64_t st = taosGetTimestampUs();  
-  /* XXXXXXXXXXXXXXXXXXXX */
-  if (pTaskInfo->pHandle->deleteQuery) {
-    static int32_t first = 1;
-    if (first) {
-      *pRes = createDataBlock();
-      int64_t rows = 33;
-      SColumnInfoData infoData = createColumnInfoData(TSDB_DATA_TYPE_BIGINT, 8, 1);
-      blockDataAppendColInfo(*pRes, &infoData);
-      blockDataEnsureCapacity(*pRes, 1);
-      (*pRes)->info.rows = 1;
 
-      SColumnInfoData* pCol1 = taosArrayGet((*pRes)->pDataBlock, 0);
-      colDataAppend(pCol1, 0, (char*)&rows, false);
-      first = 0;
-    } else {
-      *pRes = NULL;
-    }
-  } else {
-  /* XXXXXXXXXXXXXXXXXXXX */
-    *pRes = pTaskInfo->pRoot->fpSet.getNextFn(pTaskInfo->pRoot);
-  /* XXXXXXXXXXXXXXXXXXXX */
-  }
-  /* XXXXXXXXXXXXXXXXXXXX */
+  *pRes = pTaskInfo->pRoot->fpSet.getNextFn(pTaskInfo->pRoot);
   uint64_t el = (taosGetTimestampUs() - st);
 
   pTaskInfo->cost.elapsedTime += el;
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index 87239e8aa6..c30d047c47 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -4770,9 +4770,6 @@ int32_t createExecTaskInfoImpl(SSubplan* pPlan, SExecTaskInfo** pTaskInfo, SRead
                                            &(*pTaskInfo)->tableqinfoList, pPlan->user);
 
 
-  /* XXXXXXXXXXXXXXXXXXXX */
-  (*pTaskInfo)->pHandle = pHandle;
-  /* XXXXXXXXXXXXXXXXXXXX */
   if (NULL == (*pTaskInfo)->pRoot) {
     code = (*pTaskInfo)->code;
     goto _complete;
diff --git a/source/libs/qworker/src/qworker.c b/source/libs/qworker/src/qworker.c
index 28959d03af..9a5a3d1bc9 100644
--- a/source/libs/qworker/src/qworker.c
+++ b/source/libs/qworker/src/qworker.c
@@ -930,11 +930,6 @@ int32_t qwProcessDelete(QW_FPARAMS_DEF, SQWMsg *qwMsg, SDeleteRes *pRes) {
   }
 
   ctx.plan = plan;
-
-  /* XXXXXXXXXXXXXXXXXXXX */
-  SReadHandle *phandle = (SReadHandle*)qwMsg->node;
-  phandle->deleteQuery = 1;
-  /* XXXXXXXXXXXXXXXXXXXX */
   
   code = qCreateExecTask(qwMsg->node, mgmt->nodeId, tId, plan, &pTaskInfo, &sinkHandle, NULL, OPTR_EXEC_MODEL_BATCH);
   if (code) {