diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php
index 99ed6c71b..7b4813e19 100644
--- a/airtime_mvc/application/Bootstrap.php
+++ b/airtime_mvc/application/Bootstrap.php
@@ -2,59 +2,17 @@
 
 require_once __DIR__."/logging/Logging.php";
 Logging::setLogPath('/var/log/airtime/zendphp.log');
-
 require_once __DIR__."/configs/conf.php";
-
 require_once __DIR__."/configs/ACL.php";
 require_once 'propel/runtime/lib/Propel.php';
 Propel::init(__DIR__."/configs/airtime-conf-production.php");
-
 require_once __DIR__."/configs/constants.php";
-// require_once 'DB.php';
-
 require_once 'Preference.php';
 require_once "DateHelper.php";
 require_once "OsPath.php";
 require_once __DIR__.'/controllers/plugins/RabbitMqPlugin.php';
 
-global $CC_CONFIG; //, $CC_DBC;
-$dsn = $CC_CONFIG['dsn'];
-
-// ******************************************************************
-// Differences between PEAR DB & Propel/PDO:
-// When selecting a single value from a null return set,
-// PEAR returns NULL
-// PDO returns false
-// ******************************************************************
-
-
-// $CC_DBC = DB::connect($dsn, FALSE);
-// if (PEAR::isError($CC_DBC)) {
-//     echo "ERROR: ".$CC_DBC->getMessage()." ".$CC_DBC->getUserInfo()."\n";
-//     exit(1);
-// }
-// $CC_DBC->setFetchMode(DB_FETCHMODE_ASSOC);
-
-// $sql = "SELECT column_name, character_maximum_length FROM information_schema.columns"
-// ." WHERE table_name = 'cc_show' AND character_maximum_length > 0 and table_name=''";
-// // $sql = "SELECT * FROM cc_files WHERE id=1";
-// // $result = $CC_DBC->GetAll($sql);
-// $result = $CC_DBC->GetOne($sql);
-// var_dump($result);
-
-// $sql = "SELECT 1";
-// try {
-//     $con = Propel::getConnection();
-//     //$q = $con->query($sql);
-// } catch (Exception $e) {
-//     var_dump($e);
-// }
-// var_dump($q);
-// //var_dump($q->fetchAll());
-// var_dump($q->fetchColumn(0));
-
-// exit;
-
+global $CC_CONFIG;
 $CC_CONFIG['airtime_version'] = Application_Model_Preference::GetAirtimeVersion();
 
 require_once __DIR__."/configs/navigation.php";
diff --git a/install_minimal/include/airtime-db-install.php b/install_minimal/include/airtime-db-install.php
index 8fc21f6b6..862ce3756 100644
--- a/install_minimal/include/airtime-db-install.php
+++ b/install_minimal/include/airtime-db-install.php
@@ -5,8 +5,6 @@
  * cannot be created.  So this script is run after all DEB packages have been installed.
  */
 
-//set_include_path(__DIR__.'/../airtime_mvc/library' . PATH_SEPARATOR . get_include_path());
-
 require_once(__DIR__.'/AirtimeIni.php');
 require_once(__DIR__.'/AirtimeInstall.php');
 require_once(__DIR__.'/airtime-constants.php');
@@ -21,7 +19,7 @@ AirtimeInstall::CreateDatabaseUser();
 
 $databaseExisted = AirtimeInstall::CreateDatabase();
 
-//AirtimeInstall::DbConnect(true);
+AirtimeInstall::DbConnect(true);
 
 AirtimeInstall::InstallPostgresScriptingLanguage();
 
diff --git a/install_minimal/include/airtime-install.php b/install_minimal/include/airtime-install.php
index 281c346f8..6ff0aa492 100644
--- a/install_minimal/include/airtime-install.php
+++ b/install_minimal/include/airtime-install.php
@@ -10,6 +10,9 @@
 require_once(__DIR__.'/AirtimeIni.php');
 require_once(__DIR__.'/AirtimeInstall.php');
 require_once(__DIR__.'/airtime-constants.php');
+require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php');
+require_once 'propel/runtime/lib/Propel.php';
+Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php");
 
 $version = AirtimeInstall::GetVersionInstalled();
 
diff --git a/install_minimal/include/airtime-installed-check.php b/install_minimal/include/airtime-installed-check.php
index 5cbd65b10..29afd50f6 100644
--- a/install_minimal/include/airtime-installed-check.php
+++ b/install_minimal/include/airtime-installed-check.php
@@ -1,30 +1,31 @@
 <?php
 /**
- * @package Airtime
- * @copyright 2011 Sourcefabric O.P.S.
- * @license http://www.gnu.org/licenses/gpl.txt
- *
  * Checks if a current version of Airtime is installed.
  * If so, the user is presented with the help menu and can
  * choose -r to reinstall.
- * 
+ *
  * Returns 0 if Airtime is not installed
  * Returns 1 if the same version of Airtime already installed
  * Returns 2 if a previous version of Airtime is installed we can upgrade from
  * Returns 3 if a version of Airtime is installed that we can't upgrade from.
  */
-require_once(dirname(__FILE__).'/AirtimeInstall.php');
+require_once(__DIR__.'/AirtimeInstall.php');
 require_once(__DIR__.'/airtime-constants.php');
 
 AirtimeInstall::ExitIfNotRoot();
 
+require_once(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/conf.php");
+require_once('propel/runtime/lib/Propel.php');
+Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php");
+
 $version = AirtimeInstall::GetVersionInstalled();
+
 // The current version is already installed.
 echo "* Checking for existing Airtime installation...".PHP_EOL;
 if (isset($version)){
     if ($version === false){
         //version of Airtime older than 1.7.0 detected
-        exit(3);    
+        exit(3);
     } else {
         if (($version == AIRTIME_VERSION)) {
             //same version of Airtime is already installed