Index: scripts/setup.sh
===================================================================
diff -u -rb1c2f458dc6c49c923938f51a2a1a8f4ca130f2f -r4d4e46cf7c5db285778851245767b93b5882c1bc
--- scripts/setup.sh	(.../setup.sh)	(revision b1c2f458dc6c49c923938f51a2a1a8f4ca130f2f)
+++ scripts/setup.sh	(.../setup.sh)	(revision 4d4e46cf7c5db285778851245767b93b5882c1bc)
@@ -109,17 +109,25 @@
   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.service
+  disable_service connman.service
+  disable_service qtlauncher.service
+  disable_service ebikedata.service
+  disable_service rpcbind.service
+  disable_service rpcbind.socket
+  disable_service rpcbind.target
 }
 
 function setup_denali() {
@@ -156,15 +164,15 @@
 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
-  applicationPOST
+  applicationPOST "setup"
   testApplicationShasum_setup
   startCloudSync_setup
   startApplication_setup
@@ -175,7 +183,7 @@
   format_sdcard
   set_timezone
   # set_datetime "$1" "$2"
-  diable_b2qt_services
+  disable_unwanted_services
   setup_denali
   enable_autostart
   executionMode