diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install
index 024536013..1ad62c5bb 100755
--- a/install_minimal/airtime-install
+++ b/install_minimal/airtime-install
@@ -123,6 +123,18 @@ elif [ "$result" -eq "3" ]; then
     exit 1
 fi
 
+#We don't want any of our python services running if we are doing an upgrade/reinstall.
+#They will be automatically restarted later on.
+if [ -e /etc/init.d/airtime-media-monitor ]; then
+    /etc/init.d/airtime-media-monitor stop > /dev/null 2>&1
+fi
+if [ -e /etc/init.d/airtime-playout ]; then
+    /etc/init.d/airtime-playout stop > /dev/null 2>&1
+fi
+if [ -e /etc/init.d/airtime-show-recorder ]; then
+    /etc/init.d/airtime-show-recorder stop > /dev/null 2>&1
+fi
+
 
 #export these variables to make them available in sub bash scripts
 export DO_UPGRADE
diff --git a/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php
index ddc3d9646..c89cdde2a 100644
--- a/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php
@@ -445,9 +445,6 @@ class AirtimeMiscUpgrade{
     }
 }
 
-echo "Pausing Pypo".PHP_EOL;
-exec("/etc/init.d/airtime-playout stop");
-
 while (@ob_end_flush());
 
 UpgradeCommon::connectToDatabase();
@@ -456,6 +453,3 @@ AirtimeDatabaseUpgrade::start();
 AirtimeStorWatchedDirsUpgrade::start();
 AirtimeConfigFileUpgrade::start();
 AirtimeMiscUpgrade::start();
-
-//echo "Resuming Pypo".PHP_EOL;
-//exec("/etc/init.d/airtime-playout start");
diff --git a/python_apps/media-monitor/install/media-monitor-initialize.py b/python_apps/media-monitor/install/media-monitor-initialize.py
index 992487b49..b4eb7a581 100644
--- a/python_apps/media-monitor/install/media-monitor-initialize.py
+++ b/python_apps/media-monitor/install/media-monitor-initialize.py
@@ -14,8 +14,10 @@ try:
 
         #Start media-monitor daemon
         print "* Waiting for media-monitor processes to start..."
+        """
         p = Popen("/etc/init.d/airtime-media-monitor stop", shell=True)
         sts = os.waitpid(p.pid, 0)[1]
+        """
         p = Popen("/etc/init.d/airtime-media-monitor start-no-monit", shell=True)
         sts = os.waitpid(p.pid, 0)[1]
 except Exception, e:
diff --git a/python_apps/pypo/install/pypo-initialize.py b/python_apps/pypo/install/pypo-initialize.py
index 4fce8f81c..029068b99 100644
--- a/python_apps/pypo/install/pypo-initialize.py
+++ b/python_apps/pypo/install/pypo-initialize.py
@@ -104,6 +104,7 @@ try:
 
         #restart airtime-playout
         print "* Waiting for pypo processes to start..."
+        """
         if os.environ["liquidsoap_keep_alive"] == "f":
             print " * Restarting any previous Liquidsoap instances"
             p = Popen("/etc/init.d/airtime-playout stop > /dev/null 2>&1", shell=True)
@@ -112,6 +113,7 @@ try:
             print " * Keeping any previous Liquidsoap instances running"
             p = Popen("/etc/init.d/airtime-playout pypo-stop  > /dev/null 2>&1", shell=True)
             sts = os.waitpid(p.pid, 0)[1]
+        """
         p = Popen("/etc/init.d/airtime-playout start-no-monit  > /dev/null 2>&1", shell=True)
         sts = os.waitpid(p.pid, 0)[1]
     
diff --git a/python_apps/pypo/pypofetch.py b/python_apps/pypo/pypofetch.py
index 395ef2f73..797669c0a 100644
--- a/python_apps/pypo/pypofetch.py
+++ b/python_apps/pypo/pypofetch.py
@@ -208,8 +208,6 @@ class PypoFetch(Thread):
             # restarting pypo.
             # we could just restart liquidsoap but it take more time somehow.
             logger.info("Restarting pypo...")
-            #p = Popen("/etc/init.d/airtime-playout restart >/dev/null 2>&1", shell=True)
-            #sts = os.waitpid(p.pid, 0)[1]
             sys.exit(0)
         else:
             logger.info("No change detected in setting...")
diff --git a/python_apps/show-recorder/install/recorder-initialize.py b/python_apps/show-recorder/install/recorder-initialize.py
index 9bcf38453..dd0c8bdf4 100644
--- a/python_apps/show-recorder/install/recorder-initialize.py
+++ b/python_apps/show-recorder/install/recorder-initialize.py
@@ -14,8 +14,10 @@ try:
         
         #start daemon
         print "* Waiting for show-recorder processes to start..."
+        """
         p = Popen("/etc/init.d/airtime-show-recorder stop", shell=True)
         sts = os.waitpid(p.pid, 0)[1]
+        """
         p = Popen("/etc/init.d/airtime-show-recorder start-no-monit", shell=True)
         sts = os.waitpid(p.pid, 0)[1]
 except Exception, e: