diff --git a/kiauh.sh b/kiauh.sh
index 246176f..abdc090 100755
--- a/kiauh.sh
+++ b/kiauh.sh
@@ -295,12 +295,6 @@ remove_menu(){
         print_msg && clear_msg
         remove_ui;;
       5)
-        clear
-        print_header
-        remove_tornado
-        print_msg && clear_msg
-        remove_ui;;
-      6)
         clear
         print_header
         remove_nginx
diff --git a/scripts/remove.sh b/scripts/remove.sh
index 2e25f54..67ffd40 100644
--- a/scripts/remove.sh
+++ b/scripts/remove.sh
@@ -26,28 +26,22 @@ remove_klipper(){
   fi
 }
 
-remove_tornado(){
-  data_arr=(
-    $TORNADO_DIR1
-    $TORNADO_DIR2
-  )
-  print_error "Tornado" && data_count=()
-  if [ "$ERROR_MSG" = "" ]; then
-    status_msg "Removing Tornado from klippy-env ..."
-    PYTHONDIR=$KLIPPY_ENV_DIR
-    $PYTHONDIR/bin/pip uninstall tornado -y
-    CONFIRM_MSG=" Tornado successfully removed!"
-  fi
-}
-
 remove_dwc2(){
   data_arr=(
+  $TORNADO_DIR1
+  $TORNADO_DIR2
   $DWC2FK_DIR
   $WEB_DWC2
   $DWC2_DIR
   )
   print_error "DWC2-for-Klipper &\n DWC2 Web UI" && data_count=()
   if [ "$ERROR_MSG" = "" ]; then
+    if [ -d $TORNADO_DIR1 ]; then
+    status_msg "Removing Tornado from klippy-env ..."
+    PYTHONDIR=$KLIPPY_ENV_DIR
+    $PYTHONDIR/bin/pip uninstall tornado -y
+    CONFIRM_MSG=" Tornado successfully removed!"
+    fi
     if [ -d $DWC2FK_DIR ]; then
       status_msg "Removing DWC2-for-Klipper directory ..."
       rm -rf $DWC2FK_DIR && ok_msg "Directory removed!"