diff --git a/packaging/tools/remove.sh b/packaging/tools/remove.sh
index 413de17ee6e7b3d4212531de5945e56d7953271f..d34c81a4f59186ead2dd4ba58c4c14ebba52276d 100755
--- a/packaging/tools/remove.sh
+++ b/packaging/tools/remove.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Script to stop the service and uninstall TDengine, but retain the config, data and log files.
+# Script to stop and uninstall the service, but retain the config, data and log files.
 
 set -e
 #set -x
@@ -11,121 +11,216 @@ RED='\033[0;31m'
 GREEN='\033[1;32m'
 NC='\033[0m'
 
+installDir="/usr/local/taos"
+serverName="taosd"
+clientName="taos"
+uninstallScript="rmtaos"
+productName="TDengine"
+
 #install main path
-install_main_dir="/usr/local/taos"
-data_link_dir="/usr/local/taos/data"
-log_link_dir="/usr/local/taos/log"
-cfg_link_dir="/usr/local/taos/cfg"
+install_main_dir=${installDir}
+data_link_dir=${installDir}/data
+log_link_dir=${installDir}/log
+cfg_link_dir=${installDir}/cfg
 bin_link_dir="/usr/bin"
+local_bin_link_dir="/usr/local/bin"
 lib_link_dir="/usr/lib"
 lib64_link_dir="/usr/lib64"
 inc_link_dir="/usr/include"
+install_nginxd_dir="/usr/local/nginxd"
 
 service_config_dir="/etc/systemd/system"
-taos_service_name="taosd"
-
+taos_service_name=${serverName}
+taosadapter_service_name="taosadapter"
+tarbitrator_service_name="tarbitratord"
+nginx_service_name="nginxd"
 csudo=""
-if command -v sudo > /dev/null; then
-    csudo="sudo"
+if command -v sudo >/dev/null; then
+  csudo="sudo "
 fi
 
 initd_mod=0
 service_mod=2
-if pidof systemd &> /dev/null; then
-    service_mod=0
-elif $(which service &> /dev/null); then
-    service_mod=1
-    service_config_dir="/etc/init.d"
-    if $(which chkconfig &> /dev/null); then
-         initd_mod=1
-    elif $(which insserv &> /dev/null); then
-        initd_mod=2
-    elif $(which update-rc.d &> /dev/null); then
-        initd_mod=3
-    else
-        service_mod=2
-    fi
-else
+if pidof systemd &>/dev/null; then
+  service_mod=0
+elif $(which service &>/dev/null); then
+  service_mod=1
+  service_config_dir="/etc/init.d"
+  if $(which chkconfig &>/dev/null); then
+    initd_mod=1
+  elif $(which insserv &>/dev/null); then
+    initd_mod=2
+  elif $(which update-rc.d &>/dev/null); then
+    initd_mod=3
+  else
     service_mod=2
+  fi
+else
+  service_mod=2
 fi
 
+function kill_taosadapter() {
+  pid=$(ps -ef | grep "taosadapter" | grep -v "grep" | awk '{print $2}')
+  if [ -n "$pid" ]; then
+    ${csudo}kill -9 $pid || :
+  fi
+}
 
 function kill_taosd() {
-  pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
+  pid=$(ps -ef | grep ${serverName} | grep -v "grep" | awk '{print $2}')
   if [ -n "$pid" ]; then
-    ${csudo} kill -9 $pid   || :
+    ${csudo}kill -9 $pid || :
   fi
 }
 
+function kill_tarbitrator() {
+  pid=$(ps -ef | grep "tarbitrator" | grep -v "grep" | awk '{print $2}')
+  if [ -n "$pid" ]; then
+    ${csudo}kill -9 $pid || :
+  fi
+}
 
 function clean_bin() {
-    # Remove link
-    ${csudo} rm -f ${bin_link_dir}/taos        || :
-    ${csudo} rm -f ${bin_link_dir}/taosd       || :
-    ${csudo} rm -f ${bin_link_dir}/create_table  || :
-    ${csudo} rm -f ${bin_link_dir}/tmq_sim || :
-    ${csudo} rm -f ${bin_link_dir}/taosdemo    || :
-    ${csudo} rm -f ${bin_link_dir}/taosdump    || :
-    ${csudo} rm -f ${bin_link_dir}/rmtaos      || :
-    #${csudo} rm -f ${bin_link_dir}/set_core    || :
+  # Remove link
+  ${csudo}rm -f ${bin_link_dir}/${clientName} || :
+  ${csudo}rm -f ${bin_link_dir}/${serverName} || :
+  ${csudo}rm -f ${bin_link_dir}/taosadapter || :
+  ${csudo}rm -f ${bin_link_dir}/taosBenchmark || :
+  ${csudo}rm -f ${bin_link_dir}/taosdemo || :
+  ${csudo}rm -f ${bin_link_dir}/taosdump || :
+  ${csudo}rm -f ${bin_link_dir}/${uninstallScript} || :
+  ${csudo}rm -f ${bin_link_dir}/tarbitrator || :
+  ${csudo}rm -f ${bin_link_dir}/set_core || :
+  ${csudo}rm -f ${bin_link_dir}/TDinsight.sh || :
+}
+
+function clean_local_bin() {
+  ${csudo}rm -f ${local_bin_link_dir}/taosBenchmark || :
+  ${csudo}rm -f ${local_bin_link_dir}/taosdemo || :
 }
 
 function clean_lib() {
-    # Remove link
-    ${csudo} rm -f ${lib_link_dir}/libtaos.*      || :
-    ${csudo} rm -f ${lib64_link_dir}/libtaos.*    || :    
-    
-    ${csudo} rm -f ${lib_link_dir}/libtdb.*      || :
-    ${csudo} rm -f ${lib64_link_dir}/libtdb.*    || :
+  # Remove link
+  ${csudo}rm -f ${lib_link_dir}/libtaos.* || :
+  ${csudo}rm -f ${lib64_link_dir}/libtaos.* || :
+  #${csudo}rm -rf ${v15_java_app_dir}           || :
 }
 
 function clean_header() {
-    # Remove link
-    ${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}/taosudf.h  || :
+  # Remove link
+  ${csudo}rm -f ${inc_link_dir}/taos.h || :
+  ${csudo}rm -f ${inc_link_dir}/taosdef.h || :
+  ${csudo}rm -f ${inc_link_dir}/taoserror.h || :
 }
 
 function clean_config() {
-    # Remove link
-    ${csudo} rm -f ${cfg_link_dir}/*            || :
+  # Remove link
+  ${csudo}rm -f ${cfg_link_dir}/* || :
 }
 
 function clean_log() {
-    # Remove link
-    ${csudo} rm -rf ${log_link_dir}    || :
+  # Remove link
+  ${csudo}rm -rf ${log_link_dir} || :
 }
 
 function clean_service_on_systemd() {
-    taosd_service_config="${service_config_dir}/${taos_service_name}.service"
-    if systemctl is-active --quiet ${taos_service_name}; then
-        echo "TDengine taosd is running, stopping it..."
-        ${csudo} systemctl stop ${taos_service_name} &> /dev/null || echo &> /dev/null
+  taosd_service_config="${service_config_dir}/${taos_service_name}.service"
+  if systemctl is-active --quiet ${taos_service_name}; then
+    echo "${productName} ${serverName} is running, stopping it..."
+    ${csudo}systemctl stop ${taos_service_name} &>/dev/null || echo &>/dev/null
+  fi
+  ${csudo}systemctl disable ${taos_service_name} &>/dev/null || echo &>/dev/null
+  ${csudo}rm -f ${taosd_service_config}
+
+  taosadapter_service_config="${service_config_dir}/taosadapter.service"
+  if systemctl is-active --quiet ${taosadapter_service_name}; then
+    echo "${productName} taosAdapter is running, stopping it..."
+    ${csudo}systemctl stop ${taosadapter_service_name} &>/dev/null || echo &>/dev/null
+  fi
+  ${csudo}systemctl disable ${taosadapter_service_name} &>/dev/null || echo &>/dev/null
+  [ -f ${taosadapter_service_config} ] && ${csudo}rm -f ${taosadapter_service_config}
+
+  tarbitratord_service_config="${service_config_dir}/${tarbitrator_service_name}.service"
+  if systemctl is-active --quiet ${tarbitrator_service_name}; then
+    echo "${productName} tarbitrator is running, stopping it..."
+    ${csudo}systemctl stop ${tarbitrator_service_name} &>/dev/null || echo &>/dev/null
+  fi
+  ${csudo}systemctl disable ${tarbitrator_service_name} &>/dev/null || echo &>/dev/null
+  ${csudo}rm -f ${tarbitratord_service_config}
+
+  if [ "$verMode" == "cluster" ]; then
+    nginx_service_config="${service_config_dir}/${nginx_service_name}.service"
+    if [ -d ${install_nginxd_dir} ]; then
+      if systemctl is-active --quiet ${nginx_service_name}; then
+        echo "Nginx for ${productName} is running, stopping it..."
+        ${csudo}systemctl stop ${nginx_service_name} &>/dev/null || echo &>/dev/null
+      fi
+      ${csudo}systemctl disable ${nginx_service_name} &>/dev/null || echo &>/dev/null
+      ${csudo}rm -f ${nginx_service_config}
     fi
-    ${csudo} systemctl disable ${taos_service_name} &> /dev/null || echo &> /dev/null
-    ${csudo} rm -f ${taosd_service_config}
+  fi
 }
 
 function clean_service_on_sysvinit() {
-    echo " "
+  if pidof ${serverName} &>/dev/null; then
+    echo "${productName} ${serverName} is running, stopping it..."
+    ${csudo}service ${serverName} stop || :
+  fi
+
+  if pidof tarbitrator &>/dev/null; then
+    echo "${productName} tarbitrator is running, stopping it..."
+    ${csudo}service tarbitratord stop || :
+  fi
+
+  if ((${initd_mod} == 1)); then
+    if [ -e ${service_config_dir}/${serverName} ]; then
+      ${csudo}chkconfig --del ${serverName} || :
+    fi
+    if [ -e ${service_config_dir}/tarbitratord ]; then
+      ${csudo}chkconfig --del tarbitratord || :
+    fi
+  elif ((${initd_mod} == 2)); then
+    if [ -e ${service_config_dir}/${serverName} ]; then
+      ${csudo}insserv -r ${serverName} || :
+    fi
+    if [ -e ${service_config_dir}/tarbitratord ]; then
+      ${csudo}insserv -r tarbitratord || :
+    fi
+  elif ((${initd_mod} == 3)); then
+    if [ -e ${service_config_dir}/${serverName} ]; then
+      ${csudo}update-rc.d -f ${serverName} remove || :
+    fi
+    if [ -e ${service_config_dir}/tarbitratord ]; then
+      ${csudo}update-rc.d -f tarbitratord remove || :
+    fi
+  fi
+
+  ${csudo}rm -f ${service_config_dir}/${serverName} || :
+  ${csudo}rm -f ${service_config_dir}/tarbitratord || :
+
+  if $(which init &>/dev/null); then
+    ${csudo}init q || :
+  fi
 }
 
 function clean_service() {
-    if ((${service_mod}==0)); then
-        clean_service_on_systemd
-    elif ((${service_mod}==1)); then
-        clean_service_on_sysvinit
-    else
-        # must manual stop taosd
-        kill_taosd
-    fi
+  if ((${service_mod} == 0)); then
+    clean_service_on_systemd
+  elif ((${service_mod} == 1)); then
+    clean_service_on_sysvinit
+  else
+    kill_taosadapter
+    kill_taosd
+    kill_tarbitrator
+  fi
 }
 
 # Stop service and disable booting start.
 clean_service
 # Remove binary file and links
 clean_bin
+# Remove links of local bin
+clean_local_bin
 # Remove header file.
 clean_header
 # Remove lib file
@@ -135,15 +230,26 @@ clean_log
 # Remove link configuration file
 clean_config
 # Remove data link directory
-${csudo} rm -rf ${data_link_dir}    || :
-
-${csudo} rm -rf ${install_main_dir}
+${csudo}rm -rf ${data_link_dir} || :
 
+${csudo}rm -rf ${install_main_dir}
+${csudo}rm -rf ${install_nginxd_dir}
 if [[ -e /etc/os-release ]]; then
   osinfo=$(awk -F= '/^NAME/{print $2}' /etc/os-release)
 else
   osinfo=""
 fi
 
-echo -e "${GREEN}TDengine is removed successfully!${NC}"
+if echo $osinfo | grep -qwi "ubuntu"; then
+  #  echo "this is ubuntu system"
+  ${csudo}dpkg --force-all -P tdengine >/dev/null 2>&1 || :
+elif echo $osinfo | grep -qwi "debian"; then
+  #  echo "this is debian system"
+  ${csudo}dpkg --force-all -P tdengine >/dev/null 2>&1 || :
+elif echo $osinfo | grep -qwi "centos"; then
+  #  echo "this is centos system"
+  ${csudo}rpm -e --noscripts tdengine >/dev/null 2>&1 || :
+fi
+
+echo -e "${GREEN}${productName} is removed successfully!${NC}"
 echo