diff --git a/packaging/deb/DEBIAN/prerm b/packaging/deb/DEBIAN/prerm
index 2bbc6ff855..31561c5682 100644
--- a/packaging/deb/DEBIAN/prerm
+++ b/packaging/deb/DEBIAN/prerm
@@ -20,6 +20,7 @@ if [ -f ${insmetaPath}/preun.sh ]; then
 else
     bin_link_dir="/usr/bin"
     lib_link_dir="/usr/lib"
+    lib64_link_dir="/usr/lib64"
     inc_link_dir="/usr/include"
 
     data_link_dir="/usr/local/taos/data"
@@ -40,9 +41,11 @@ else
     ${csudo}rm -f ${inc_link_dir}/taoserror.h     || :
     ${csudo}rm -f ${inc_link_dir}/tdef.h     || :
     ${csudo}rm -f ${inc_link_dir}/taosudf.h     || :
-    [ -f ${inc_link_dir}/taosws.h ] && ${csudo}rm -f ${inc_link_dir}/taosws.h     || :
+    ${csudo}rm -f ${inc_link_dir}/taosws.h     || :    
     ${csudo}rm -f ${lib_link_dir}/libtaos.*  || :
-    [ -f ${lib_link_dir}/libtaosws.so ] && ${csudo}rm -f ${lib_link_dir}/libtaosws.so  || :
+    ${csudo}rm -f ${lib64_link_dir}/libtaos.*  || :
+    ${csudo}rm -f ${lib_link_dir}/libtaosws.so  || :
+    ${csudo}rm -f ${lib64_link_dir}/libtaosws.so  || : 
 
     ${csudo}rm -f ${log_link_dir}            || :
     ${csudo}rm -f ${data_link_dir}           || :
diff --git a/packaging/rpm/tdengine.spec b/packaging/rpm/tdengine.spec
index 0a107a4108..000a82b6b4 100644
--- a/packaging/rpm/tdengine.spec
+++ b/packaging/rpm/tdengine.spec
@@ -223,6 +223,7 @@ if [ $1 -eq 0 ];then
   else
     bin_link_dir="/usr/bin"
     lib_link_dir="/usr/lib"
+    lib64_link_dir="/usr/lib64"
     inc_link_dir="/usr/include"
 
     data_link_dir="/usr/local/taos/data"
@@ -235,13 +236,18 @@ if [ $1 -eq 0 ];then
     ${csudo}rm -f ${bin_link_dir}/udfd       || :
     ${csudo}rm -f ${bin_link_dir}/taosadapter       || :
     ${csudo}rm -f ${bin_link_dir}/taoskeeper       || :
+    ${csudo}rm -f ${bin_link_dir}/taosdump       || :
+    ${csudo}rm -f ${bin_link_dir}/taosBenchmark       || :
     ${csudo}rm -f ${cfg_link_dir}/*          || :
     ${csudo}rm -f ${inc_link_dir}/taos.h     || :
     ${csudo}rm -f ${inc_link_dir}/taosdef.h     || :
     ${csudo}rm -f ${inc_link_dir}/taoserror.h     || :
     ${csudo}rm -f ${inc_link_dir}/tdef.h     || :
-    ${csudo}rm -f ${inc_link_dir}/taosudf.h     || :    
-    ${csudo}rm -f ${lib_link_dir}/libtaos.*  || :
+    ${csudo}rm -f ${inc_link_dir}/taosudf.h     || :  
+    ${csudo}rm -f ${inc_link_dir}/taows.h     || :    
+    ${csudo}rm -f ${lib_link_dir}/libtaos.so  || :
+    ${csudo}rm -f ${lib_link_dir}/libtaosws.so  || :
+    ${csudo}rm -f ${lib64_link_dir}/libtaosws.so  || :
 
     ${csudo}rm -f ${log_link_dir}            || :
     ${csudo}rm -f ${data_link_dir}           || :
diff --git a/packaging/tools/remove.sh b/packaging/tools/remove.sh
index 378949591f..093c81eef4 100755
--- a/packaging/tools/remove.sh
+++ b/packaging/tools/remove.sh
@@ -12,6 +12,8 @@ RED='\033[0;31m'
 GREEN='\033[1;32m'
 NC='\033[0m'
 
+PREFIX="taos"
+
 if [ "$osType" != "Darwin" ]; then
   installDir="/usr/local/taos"
   bin_link_dir="/usr/bin"
@@ -32,7 +34,6 @@ else
   inc_link_dir="/usr/local/include"
 fi
 
-PREFIX="taos"
 serverName="${PREFIX}d"
 clientName="${PREFIX}"
 uninstallScript="rm${PREFIX}"
@@ -46,8 +47,6 @@ explorerName="${PREFIX}-explorer"
 tarbitratorName="tarbitratord"
 productName="TDengine"
 
-installDir="/usr/local/${PREFIX}"
-
 #install main path
 install_main_dir=${installDir}
 data_link_dir=${installDir}/data
diff --git a/packaging/tools/remove_client.sh b/packaging/tools/remove_client.sh
index d183c10a31..de14cb38d9 100755
--- a/packaging/tools/remove_client.sh
+++ b/packaging/tools/remove_client.sh
@@ -63,10 +63,13 @@ function clean_bin() {
 }
 
 function clean_lib() {
-    # Remove link
-    ${csudo}rm -f ${lib_link_dir}/libtaos.*      || :
-    ${csudo}rm -f ${lib64_link_dir}/libtaos.*    || :
-    #${csudo}rm -rf ${v15_java_app_dir}           || :
+  # Remove link
+  ${csudo}rm -f ${lib_link_dir}/libtaos.* || :
+  [ -f ${lib_link_dir}/libtaosws.* ] && ${csudo}rm -f ${lib_link_dir}/libtaosws.* || :
+
+  ${csudo}rm -f ${lib64_link_dir}/libtaos.* || :
+  [ -f ${lib64_link_dir}/libtaosws.* ] && ${csudo}rm -f ${lib64_link_dir}/libtaosws.* || :
+  #${csudo}rm -rf ${v15_java_app_dir}           || :
 }
 
 function clean_header() {
@@ -76,6 +79,7 @@ function clean_header() {
     ${csudo}rm -f ${inc_link_dir}/taoserror.h      || :
     ${csudo}rm -f ${inc_link_dir}/tdef.h      || :
     ${csudo}rm -f ${inc_link_dir}/taosudf.h      || :    
+    ${csudo}rm -f ${inc_link_dir}/taosws.h      || :
 }
 
 function clean_config() {