diff --git a/airtime_mvc/application/controllers/UpgradeController.php b/airtime_mvc/application/controllers/UpgradeController.php
index 4a745b657..3e92ed2b2 100644
--- a/airtime_mvc/application/controllers/UpgradeController.php
+++ b/airtime_mvc/application/controllers/UpgradeController.php
@@ -18,7 +18,7 @@ class UpgradeController extends Zend_Controller_Action
         }
         
         //Begin upgrade
-        $filename = "/etc/airtime/airtime.conf";
+        $filename = isset($_SERVER['AIRTIME_CONF']) ? $_SERVER['AIRTIME_CONF'] : "/etc/airtime/airtime.conf";
         $values = parse_ini_file($filename, true);
         
         $username = $values['database']['dbuser'];
diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php
index 866e8327f..87cbe0704 100644
--- a/airtime_mvc/application/models/StoredFile.php
+++ b/airtime_mvc/application/models/StoredFile.php
@@ -393,9 +393,8 @@ SQL;
         
         
         if (file_exists($filepath) && $type == "stor") {
-            $data = array("filepath" => $filepath, "delete" => 1);
             try {
-                Application_Model_RabbitMq::SendMessageToMediaMonitor("file_delete", $data);
+                unlink($filepath);
             } catch (Exception $e) {
                 Logging::error($e->getMessage());
                 return;