diff --git a/Sccp_manager.class.php b/Sccp_manager.class.php
index 2475a63..f1e69a4 100644
--- a/Sccp_manager.class.php
+++ b/Sccp_manager.class.php
@@ -875,7 +875,6 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
                 }
                 break;
             case 'getDeviceModel':
-//dbug('getting Device model');
                 switch ($request['type']) {
                     case 'all':
                     case 'extension':
@@ -936,7 +935,6 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
                 return $result;
                 break;
             case 'getExtensionGrid':
-//dbug('getting Extension Grid');
                 $result = $this->dbinterface->HWextension_db_SccpTableData('SccpExtension');
                 if (empty($result)) {
                     return array();
@@ -960,7 +958,6 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
                 return $result;
                 break;
             case 'getPhoneGrid':
-//dbug('getting Phone Grid');
                 $cmd_type = !empty($request['type']) ? $request['type'] : '';
 
                 $result = $this->dbinterface->HWextension_db_SccpTableData('SccpDevice', array('type' => $cmd_type));
@@ -1873,7 +1870,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
 
 //        $save_settings = array();
         if (empty($save_value)) {
-            $this->dbinterface->write('sccpsettings', $this->sccpvalues, 'replace');
+            $this->dbinterface->write('sccpsettings', $this->sccpvalues, 'replace'); //Change to replace as clearer
         } else {
             $this->dbinterface->write('sccpsettings', $save_value, 'update');
         }
@@ -2138,7 +2135,6 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
             $dir_list = $this->findAllFiles($dir, $file_ext, 'fileonly');
         }
         $raw_settings = $this->dbinterface->getDb_model_info($get, $format_list, $filter);
-//dbug('reloading table');
         if ($validate) {
             for ($i = 0; $i < count($raw_settings); $i++) {
                 $raw_settings[$i]['validate'] = '-;-';
diff --git a/install.php b/install.php
index b83d4fc..54d2dca 100644
--- a/install.php
+++ b/install.php
@@ -1004,7 +1004,6 @@ if (!$sccp_db_ver) {
 InstallDB_createButtonConfigTrigger();
 InstallDB_CreateSccpDeviceConfigView($sccp_compatible);
 InstallDB_updateDBVer($sccp_compatible);
-dbug('chanSCCPWarning',$chanSCCPWarning);
 if ($chanSCCPWarning) {
     outn("<br>");
     outn("<font color='red'>Warning: Upgrade chan_sccp_b to use full ami functionality</font>");