More cleaning of the Db.php file