diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install
index 0bd704900..da3f3cf3d 100755
--- a/install_minimal/airtime-install
+++ b/install_minimal/airtime-install
@@ -208,8 +208,6 @@ if [ "$mediamonitor" = "t" -o "$pypo" = "t" ]; then
 fi
 
 
-/usr/lib/airtime/utils/rabbitmq-update-pid.sh > /dev/null
-
 touch /usr/share/airtime/public/index.php
 
 if [ "$python_service" -eq "0" ]; then
diff --git a/install_minimal/include/airtime-initialize.sh b/install_minimal/include/airtime-initialize.sh
index 50cf65b9f..63a7c55a2 100755
--- a/install_minimal/include/airtime-initialize.sh
+++ b/install_minimal/include/airtime-initialize.sh
@@ -57,7 +57,6 @@ invoke-rc.d monit restart
 sleep 1
 
 set +e
-
 if [ "$mediamonitor" = "t" ]; then
     monit monitor airtime-media-monitor
 fi
@@ -65,6 +64,4 @@ if [ "$pypo" = "t" ]; then
     monit monitor airtime-playout
     monit monitor airtime-liquidsoap
 fi
-
-monit monitor rabbitmq-server
 set -e
diff --git a/install_minimal/include/airtime-remove-files.sh b/install_minimal/include/airtime-remove-files.sh
index 2e7f69489..2429c17f4 100755
--- a/install_minimal/include/airtime-remove-files.sh
+++ b/install_minimal/include/airtime-remove-files.sh
@@ -1,6 +1,4 @@
 #!/bin/bash
-#-e Causes bash script to exit if any of the installers
-#return with a non-zero return value.
 
 if [[ $EUID -ne 0 ]]; then
     echo "Please run as root user."
@@ -20,17 +18,9 @@ SCRIPTPATH=`dirname $SCRIPT`
 
 AIRTIMEROOT=$SCRIPTPATH/../../
 
-#rm -f /etc/airtime/airtime.conf
-#rm -f /etc/airtime/api_client.cfg
-#rm -f /etc/airtime/recorder.cfg
-#rm -f /etc/airtime/media-monitor.cfg
-#rm -f /etc/airtime/pypo.cfg
-#rm -f /etc/airtime/liquidsoap.cfg
-
 rm -f /etc/cron.d/airtime-crons
-
-#virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
-#. ${virtualenv_bin}activate
+rm -f /etc/monit/conf.d/monit-airtime*
+rm -f /etc/logrotate.d/airtime-php
 
 echo "* API Client"
 python $AIRTIMEROOT/python_apps/api_clients/install/api_client_uninstall.py
@@ -38,8 +28,6 @@ echo "* Pypo"
 python $AIRTIMEROOT/python_apps/pypo/install/pypo-remove-files.py
 echo "* Media-Monitor"
 python $AIRTIMEROOT/python_apps/media-monitor/install/media-monitor-remove-files.py
-#echo "* Show-Recorder"
-#python $AIRTIMEROOT/python_apps/show-recorder/install/recorder-remove-files.py
 
 #remove symlinks
 rm -f /usr/bin/airtime-import
diff --git a/python_apps/media-monitor/install/media-monitor-uninitialize.py b/python_apps/media-monitor/install/media-monitor-uninitialize.py
index 84c8fb139..c73801b46 100644
--- a/python_apps/media-monitor/install/media-monitor-uninitialize.py
+++ b/python_apps/media-monitor/install/media-monitor-uninitialize.py
@@ -13,5 +13,7 @@ try:
         print "OK"
     else:
         print "Wasn't running"
+
+    subprocess.call("update-rc.d -f airtime-media-monitor remove".split(" "))
 except Exception, e:
     print e
diff --git a/python_apps/pypo/install/pypo-uninitialize.py b/python_apps/pypo/install/pypo-uninitialize.py
index 8765e5a18..65ac91991 100644
--- a/python_apps/pypo/install/pypo-uninitialize.py
+++ b/python_apps/pypo/install/pypo-uninitialize.py
@@ -6,7 +6,7 @@ if os.geteuid() != 0:
     print "Please run this as root."
     sys.exit(1)
 
-try:      
+try:
     #stop pypo and liquidsoap processes
     print "Waiting for Pypo process to stop...",
     try:
@@ -18,12 +18,16 @@ try:
         print "OK"
     else:
         print "Wasn't running"
-        
+
     print "Waiting for Liquidsoap process to stop...",
     if (os.path.exists('/etc/init.d/airtime-liquidsoap')):
         subprocess.call("invoke-rc.d airtime-liquidsoap stop", shell=True)
         print "OK"
     else:
         print "Wasn't running"
+
+    subprocess.call("update-rc.d -f airtime-playout remove".split(" "))
+    subprocess.call("update-rc.d -f airtime-liquidsoap remove".split(" "))
+
 except Exception, e:
     print e
diff --git a/python_apps/pypo/install/pypo-uninstall.py b/python_apps/pypo/install/pypo-uninstall.py
deleted file mode 100644
index 7bc01ca4b..000000000
--- a/python_apps/pypo/install/pypo-uninstall.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import os
-import sys
-from configobj import ConfigObj
-
-if os.geteuid() != 0:
-    print "Please run this as root."
-    sys.exit(1)
-    
-PATH_INI_FILE = '/etc/airtime/pypo.cfg'
-
-def remove_path(path):
-    os.system('rm -rf "%s"' % path)
-
-def get_current_script_dir():
-  current_script_dir = os.path.realpath(__file__)
-  index = current_script_dir.rindex('/')
-  return current_script_dir[0:index]
-
-def remove_monit_file():
-    os.system("rm -f /etc/monit/conf.d/monit-airtime-playout.cfg")
-    os.system("rm -f /etc/monit/conf.d/monit-airtime-liquidsoap.cfg")
-    
-try:
-    # load config file
-    try:
-        config = ConfigObj(PATH_INI_FILE)
-    except Exception, e:
-        print 'Error loading config file: ', e
-        sys.exit(1)
-        
-    os.system("invoke-rc.d airtime-playout stop")
-    os.system("invoke-rc.d airtime-liquidsoap stop")
-    
-    os.system("rm -f /etc/init.d/airtime-playout")
-    os.system("rm -f /etc/init.d/airtime-liquidsoap")
-    
-    os.system("update-rc.d -f airtime-playout remove >/dev/null 2>&1")
-    os.system("update-rc.d -f airtime-liquidsoap remove >/dev/null 2>&1")
-
-    #remove logrotate script
-    os.system("rm -f /etc/logrotate.d/airtime-liquidsoap")
-
-    print "Removing monit file"
-    remove_monit_file()
-        
-    print "Removing cache directories"
-    remove_path(config["cache_base_dir"])
-    
-    print "Removing symlinks"
-    os.system("rm -f /usr/bin/airtime-liquidsoap")
-    
-    print "Removing pypo files"
-    remove_path(config["bin_dir"])
-    
-    print "Pypo uninstall complete."
-except Exception, e:
-    print "exception:" + str(e)