diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php
index 0040428dd..5d78e8677 100644
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@@ -696,7 +696,6 @@ class ApiController extends Zend_Controller_Action
             "platform"=>Application_Model_Systemstatus::GetPlatformInfo(),
             "airtime_version"=>Application_Model_Preference::GetAirtimeVersion(),
             "services"=>array(
-                "rabbitmq"=>Application_Model_Systemstatus::GetRabbitMqStatus(),
                 "pypo"=>Application_Model_Systemstatus::GetPypoStatus(),
                 "liquidsoap"=>Application_Model_Systemstatus::GetLiquidsoapStatus(),
                 "media_monitor"=>Application_Model_Systemstatus::GetMediaMonitorStatus()
@@ -994,7 +993,6 @@ class ApiController extends Zend_Controller_Action
         $request = $this->getRequest();
         $data = $request->getParam("data");
         $media_id = $request->getParam("media_id");
-
         $data_arr = json_decode($data);
 
         if (!is_null($media_id)) {
diff --git a/airtime_mvc/application/controllers/SystemstatusController.php b/airtime_mvc/application/controllers/SystemstatusController.php
index c84a23f9e..496dae625 100644
--- a/airtime_mvc/application/controllers/SystemstatusController.php
+++ b/airtime_mvc/application/controllers/SystemstatusController.php
@@ -17,7 +17,6 @@ class SystemstatusController extends Zend_Controller_Action
             "pypo"=>Application_Model_Systemstatus::GetPypoStatus(),
             "liquidsoap"=>Application_Model_Systemstatus::GetLiquidsoapStatus(),
             "media-monitor"=>Application_Model_Systemstatus::GetMediaMonitorStatus(),
-            "rabbitmq-server"=>Application_Model_Systemstatus::GetRabbitMqStatus()
         );
 
         $partitions = Application_Model_Systemstatus::GetDiskInfo();
diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install
index da3f3cf3d..68005f54b 100755
--- a/install_minimal/airtime-install
+++ b/install_minimal/airtime-install
@@ -213,7 +213,7 @@ touch /usr/share/airtime/public/index.php
 if [ "$python_service" -eq "0" ]; then
     #only run airtime-check-system if all components were installed
     echo -e "\n*** Verifying your system environment, running airtime-check-system ***"
-    sleep 15
+    sleep 10
 
     set +e
     airtime-check-system --no-color
diff --git a/install_minimal/include/airtime-uninitialize.sh b/install_minimal/include/airtime-uninitialize.sh
index b5460285a..c76bcdfd6 100755
--- a/install_minimal/include/airtime-uninitialize.sh
+++ b/install_minimal/include/airtime-uninitialize.sh
@@ -19,7 +19,6 @@ set +e
 monit unmonitor airtime-media-monitor >/dev/null 2>&1
 monit unmonitor airtime-liquidsoap >/dev/null 2>&1
 monit unmonitor airtime-playout >/dev/null 2>&1
-monit unmonitor rabbitmq-server
 set -e
 
 #virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
diff --git a/python_apps/pypo/airtime-liquidsoap-init-d b/python_apps/pypo/airtime-liquidsoap-init-d
index 106006fab..21323e850 100755
--- a/python_apps/pypo/airtime-liquidsoap-init-d
+++ b/python_apps/pypo/airtime-liquidsoap-init-d
@@ -17,15 +17,7 @@ DAEMON=/usr/lib/airtime/pypo/bin/airtime-liquidsoap
 PIDFILE=/var/run/airtime-liquidsoap.pid
 
 start () {
-        chown pypo:pypo /var/log/airtime/pypo
-        chown pypo:pypo /var/log/airtime/pypo-liquidsoap
-
-        touch /var/run/airtime-liquidsoap.pid
-        chown pypo:pypo /var/run/airtime-liquidsoap.pid
-
-        start-stop-daemon --start --quiet --chuid $USERID:$GROUPID \
-        --pidfile /var/run/airtime-liquidsoap.pid --nicelevel -15 --startas $DAEMON
-        
+        start_no_monit
         monit monitor airtime-liquidsoap >/dev/null 2>&1
 }
 
@@ -39,7 +31,14 @@ stop () {
 }
 
 start_no_monit() {
-        start-stop-daemon --start --background --quiet --chuid $USERID:$USERID --make-pidfile --pidfile $PIDFILE --startas $DAEMON        
+        chown pypo:pypo /var/log/airtime/pypo
+        chown pypo:pypo /var/log/airtime/pypo-liquidsoap
+
+        touch /var/run/airtime-liquidsoap.pid
+        chown pypo:pypo /var/run/airtime-liquidsoap.pid
+
+        start-stop-daemon --start --quiet --chuid $USERID:$GROUPID \
+            --pidfile /var/run/airtime-liquidsoap.pid --nicelevel -15 --startas $DAEMON
 }
 
 
diff --git a/python_apps/pypo/monit-airtime-liquidsoap.cfg b/python_apps/pypo/monit-airtime-liquidsoap.cfg
index 297854faa..3b674aec2 100644
--- a/python_apps/pypo/monit-airtime-liquidsoap.cfg
+++ b/python_apps/pypo/monit-airtime-liquidsoap.cfg
@@ -12,5 +12,5 @@
     if failed host localhost port 1234
       send "version\r\nexit\r\n"
       expect "Liquidsoap"
-      retry 3
+    with timeout 2 seconds retry 3 for 2 cycles
     then restart 
diff --git a/utils/airtime-check-system.php b/utils/airtime-check-system.php
index a780b1243..86f13b5b7 100644
--- a/utils/airtime-check-system.php
+++ b/utils/airtime-check-system.php
@@ -205,17 +205,6 @@ class AirtimeCheck {
                 $log = "/var/log/airtime/media-monitor/media-monitor.log";
                 self::show_log_file($log);
             }
-            if (isset($services->rabbitmq)) {
-                self::output_status("RABBITMQ_PROCESS_ID", $data->services->rabbitmq->process_id);
-                self::output_status("RABBITMQ_RUNNING_SECONDS", $data->services->rabbitmq->uptime_seconds);
-                self::output_status("RABBITMQ_MEM_PERC", $data->services->rabbitmq->memory_perc);
-                self::output_status("RABBITMQ_CPU_PERC", $data->services->rabbitmq->cpu_perc);
-            } else {
-                self::output_status("RABBITMQ_PROCESS_ID", "FAILED");
-                self::output_status("RABBITMQ_RUNNING_SECONDS", "0");
-                self::output_status("RABBITMQ_MEM_PERC", "0%");
-                self::output_status("RABBITMQ_CPU_PERC", "0%");
-            }
         }
 
         if (self::$AIRTIME_STATUS_OK){