diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 5aa453f30e..5313e5378a 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -6647,7 +6647,7 @@ void freeqinfoFn(void *qhandle) {
 }
 
 void* qOpenQueryMgmt(int32_t vgId) {
-  const int32_t REFRESH_HANDLE_INTERVAL = 2; // every 2 seconds, refresh handle pool
+  const int32_t REFRESH_HANDLE_INTERVAL = 30; // every 30 seconds, refresh handle pool
 
   char cacheName[128] = {0};
   sprintf(cacheName, "qhandle_%d", vgId);
diff --git a/src/util/inc/tcache.h b/src/util/inc/tcache.h
index 5a3545fd8f..1e2aeae394 100644
--- a/src/util/inc/tcache.h
+++ b/src/util/inc/tcache.h
@@ -68,8 +68,6 @@ typedef struct {
   int64_t         refreshTime;
   STrashElem *    pTrash;
   char*           name;
-//  void *          tmrCtrl;
-//  void *          pTimer;
   SCacheStatis    statistics;
   SHashObj *      pHashTable;
   __cache_free_fn_t freeFp;
diff --git a/src/util/src/tcache.c b/src/util/src/tcache.c
index ca0fdc36be..0a9a69737b 100644
--- a/src/util/src/tcache.c
+++ b/src/util/src/tcache.c
@@ -573,6 +573,7 @@ void taosRemoveFromTrashCan(SCacheObj *pCacheObj, STrashElem *pElem) {
   free(pElem);
 }
 
+// TODO add another lock when scanning trashcan
 void taosTrashCanEmpty(SCacheObj *pCacheObj, bool force) {
   __cache_wr_lock(pCacheObj);