diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 0005ed8e6a5..8fe32acc931 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1407,7 +1407,6 @@ class Adherent extends CommonObject
             $query = "INSERT INTO spip_auteurs (nom, email, login, pass, htpass, alea_futur, statut) VALUES(\"".$this->prenom." ".$this->nom."\",\"".$this->email."\",\"".$this->login."\",\"$mdpass\",\"$htpass\",FLOOR(32000*RAND()),\"1comite\")";
 
             $mydb=getDoliDBInstance('mysql',ADHERENT_SPIP_SERVEUR,ADHERENT_SPIP_USER,ADHERENT_SPIP_PASS,ADHERENT_SPIP_DB,ADHERENT_SPIP_PORT);
-            //$mydb=new DoliDb('mysql',ADHERENT_SPIP_SERVEUR,ADHERENT_SPIP_USER,ADHERENT_SPIP_PASS,ADHERENT_SPIP_DB,ADHERENT_SPIP_PORT);
 
             $result = $mydb->query($query);
             if ($result)
@@ -1438,7 +1437,6 @@ class Adherent extends CommonObject
             $query = "DELETE FROM spip_auteurs WHERE login='".$this->login."'";
 
             $mydb=getDoliDBInstance('mysql',ADHERENT_SPIP_SERVEUR,ADHERENT_SPIP_USER,ADHERENT_SPIP_PASS,ADHERENT_SPIP_DB,ADHERENT_SPIP_PORT);
-            //$mydb=new DoliDb('mysql',ADHERENT_SPIP_SERVEUR,ADHERENT_SPIP_USER,ADHERENT_SPIP_PASS,ADHERENT_SPIP_DB,ADHERENT_SPIP_PORT);
 
             $result = $mydb->query($query);
             if ($result)
diff --git a/htdocs/boutique/osc_master.inc.php b/htdocs/boutique/osc_master.inc.php
index 92960baab17..c1e26a1d6e8 100644
--- a/htdocs/boutique/osc_master.inc.php
+++ b/htdocs/boutique/osc_master.inc.php
@@ -25,7 +25,7 @@
  * Creation objet $dbosc
  */
 $dbosc=getDoliDBInstance($conf->db->type,$conf->global->OSC_DB_HOST,$conf->global->OSC_DB_USER,$conf->global->OSC_DB_PASS,$conf->global->OSC_DB_NAME,$conf->global->OSC_DB_PORT);
-//$dbosc = new DoliDb($conf->db->type,$conf->global->OSC_DB_HOST,$conf->global->OSC_DB_USER,$conf->global->OSC_DB_PASS,$conf->global->OSC_DB_NAME,$conf->global->OSC_DB_PORT);
+
 if (! $dbosc->connected)
 {
     dol_syslog($dbosc,"host=".$conf->global->OSC_DB_HOST.", user=".$conf->global->OSC_DB_USER.", databasename=".$conf->global->OSC_DB_NAME.", ".$db->error,LOG_ERR);
diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
index da522def453..ac07c28b335 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.php
@@ -159,7 +159,6 @@ if (! $error)
 			//print $_POST["db_type"].",".$_POST["db_host"].",$userroot,$passroot,$databasefortest,".$_POST["db_port"];
 
             $db=getDoliDBInstance($_POST["db_type"],$_POST["db_host"],$userroot,$passroot,$databasefortest,$_POST["db_port"]);
-			//$db = new DoliDb($_POST["db_type"],$_POST["db_host"],$userroot,$passroot,$databasefortest,$_POST["db_port"]);
 
 			dol_syslog("databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected, LOG_DEBUG);
 			//print "databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected;
@@ -184,8 +183,8 @@ if (! $error)
 		if (! $error && (empty($_POST["db_create_database"]) && empty($_POST["db_create_user"])))
 		{
             $db=getDoliDBInstance($_POST["db_type"],$_POST["db_host"],$_POST["db_user"],$_POST["db_pass"],$_POST["db_name"],$_POST["db_port"]);
-		    //$db = new DoliDb($_POST["db_type"],$_POST["db_host"],$_POST["db_user"],$_POST["db_pass"],$_POST["db_name"],$_POST["db_port"]);
-			if ($db->error)
+
+            if ($db->error)
 			{
 				print '<div class="error">'.$db->error.'</div>';
 				if (! $db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
@@ -434,8 +433,8 @@ if (! $error && $db->connected && $action == "set")
 			// Creation handler de base, verification du support et connexion
 
             $db=getDoliDBInstance($conf->db->type,$conf->db->host,$userroot,$passroot,$databasefortest,$conf->db->port);
-			//$db = new DoliDb($conf->db->type,$conf->db->host,$userroot,$passroot,$databasefortest,$conf->db->port);
-			if ($db->error)
+
+            if ($db->error)
 			{
 				print '<div class="error">'.$db->error.'</div>';
 				$error++;
@@ -509,7 +508,6 @@ if (! $error && $db->connected && $action == "set")
 		{
 			dolibarr_install_syslog("etape1: Create database : ".$dolibarr_main_db_name, LOG_DEBUG);
             $db=getDoliDBInstance($conf->db->type,$conf->db->host,$userroot,$passroot,'',$conf->db->port);
-			//$db = new DoliDb($conf->db->type,$conf->db->host,$userroot,$passroot,'',$conf->db->port);
 
 			if ($db->connected)
 			{
@@ -573,7 +571,6 @@ if (! $error && $db->connected && $action == "set")
 			//print "connexion de type=".$conf->db->type." sur host=".$conf->db->host." port=".$conf->db->port." user=".$conf->db->user." name=".$conf->db->name;
 
             $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
-			//$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
 
 			if ($db->connected == 1)
 			{
diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php
index b68d144fc17..faac2888cf9 100644
--- a/htdocs/install/etape2.php
+++ b/htdocs/install/etape2.php
@@ -80,8 +80,8 @@ if ($action == "set")
 	$error=0;
 
     $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
-	//$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
-	if ($db->connected == 1)
+
+    if ($db->connected == 1)
 	{
 		print "<tr><td>";
 		print $langs->trans("ServerConnection")." : ".$conf->db->host."</td><td>".$langs->trans("OK")."</td></tr>";
diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php
index 9007e3a1db0..76c9329f4c0 100644
--- a/htdocs/install/etape4.php
+++ b/htdocs/install/etape4.php
@@ -70,7 +70,7 @@ print '<br>'.$langs->trans("LastStepDesc").'<br><br>';
 print '<table cellspacing="0" cellpadding="2" width="100%">';
 
 $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
-//$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
+
 if ($db->ok == 1)
 {
 	print '<tr><td>'.$langs->trans("DolibarrAdminLogin").' :</td><td>';
diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php
index 4c845b0db7f..9bb613b1159 100644
--- a/htdocs/install/etape5.php
+++ b/htdocs/install/etape5.php
@@ -137,7 +137,6 @@ if ($action == "set" || preg_match('/upgrade/i',$action))
 	$conf->db->dolibarr_main_db_cryptkey = isset($dolibarr_main_db_cryptkey)?$dolibarr_main_db_cryptkey:'';
 
     $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
-	//$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
 
 	$ok = 0;
 
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 17e6c284625..8c0b774c728 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -95,7 +95,7 @@ $conf->db->user = $dolibarr_main_db_user;
 $conf->db->pass = $dolibarr_main_db_pass;
 
 $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
-//$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
+
 if ($db->connected == 1)
 {
 	print '<tr><td nowrap="nowrap">';
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index 0eeb5f6b733..328ed9ad531 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -112,8 +112,8 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
 	$conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey;
 
     $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
-	//$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
-	if ($db->connected == 1)
+
+    if ($db->connected == 1)
 	{
 		print '<tr><td nowrap="nowrap">';
 		print $langs->trans("ServerConnection")." : $dolibarr_main_db_host</td><td align=\"right\">".$langs->trans("OK")."</td></tr>\n";
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 25c16e4c171..879711c0408 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -106,8 +106,8 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
 	$conf->db->pass = $dolibarr_main_db_pass;
 
     $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
-	//$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
-	if ($db->connected != 1)
+
+    if ($db->connected != 1)
 	{
 		print '<tr><td colspan="4">'.$langs->trans("ErrorFailedToConnectToDatabase",$conf->db->name).'</td><td align="right">'.$langs->trans('Error').'</td></tr>';
 		dolibarr_install_syslog('upgrade2: Failed to connect to database : '.$conf->db->name.' on '.$conf->db->host.' for user '.$conf->db->user, LOG_ERR);
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 0ac7204ba5f..b1293ff87c9 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -98,7 +98,6 @@ if (! defined('NOREQUIRETRAN'))
 if (! defined('NOREQUIREDB'))
 {
     $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
-	//$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
 
 	if ($db->error)
 	{