Index: scripts/setup.sh
===================================================================
diff -u -rff5794ee387f1e37a01cea349c0085dae5281d5d -r21e5474c3b148fa1337b5d10d9cb4562c209faf9
--- scripts/setup.sh	(.../setup.sh)	(revision ff5794ee387f1e37a01cea349c0085dae5281d5d)
+++ scripts/setup.sh	(.../setup.sh)	(revision 21e5474c3b148fa1337b5d10d9cb4562c209faf9)
@@ -109,17 +109,23 @@
   done
 }
 
-function diable_b2qt_services() {
-  echo "Disabling boot2Qt setvices"
-  systemctl disable b2qt
-  systemctl disable connman
-  systemctl disable qtlauncher
-  systemctl disable ebikedata
+function disable_service() {
+  echo "Disabling '$1' service"
+  systemctl stop    "$1"
+  systemctl disable "$1" 
+  if [ -z $(systemctl status | cat | grep "$1" | grep -v grep) ]; then
+    echo "'$1' service disabled"
+  else
+    echo "'$1' service not disabled!"
+  fi
+}
 
-  echo "Stop the boot2Qt setvices"
-  killall qtlauncher
-  killall datacollector
-  killall appcontroller
+function disable_unwanted_services() {
+  disable_service b2qt
+  disable_service connman
+  disable_service qtlauncher
+  disable_service ebikedata
+  disable_service rpcbind  
 }
 
 function setup_denali() {
@@ -156,11 +162,11 @@
 function executionMode() {
   if [ "$(grep $SETUP_ENABLE_MANUFACTURING_MODE $SETUP_CONF_FILE)" = "" ]; then
     # -U for Updating mode
-          # -a for disabling the non-minimizable Alarms
+    # -a for disabling the non-minimizable Alarms
     APPLICATION_PARAMS="-U -a"
   else
     # -E for Maunufacturing mode
-          # -a for disabling the non-minimizable Alarms
+    # -a for disabling the non-minimizable Alarms
     APPLICATION_PARAMS="-E -a"
   fi
   enableDRT
@@ -175,7 +181,7 @@
   format_sdcard
   set_timezone
   # set_datetime "$1" "$2"
-  diable_b2qt_services
+  disable_unwanted_services
   setup_denali
   enable_autostart
   executionMode