diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php
index cb8c8289a3..dd388a35e0 100644
--- a/libraries/List_Database.class.php
+++ b/libraries/List_Database.class.php
@@ -205,8 +205,7 @@ class PMA_List_Database extends PMA_List
             // thus containing not escaped _ or %
             if (! preg_match('/(^|[^\\\\])(_|%)/', $each_only_db)) {
                 // ... not contains wildcard
-                $items[] = PMA_CommonFunctions::getInstance()
-                    ->unescapeMysqlWildcards($each_only_db);
+                $items[] = PMA_Util::unescapeMysqlWildcards($each_only_db);
                 continue;
             }
 
diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php
index 204cf61387..c48e846756 100644
--- a/libraries/Tracker.class.php
+++ b/libraries/Tracker.class.php
@@ -450,7 +450,7 @@ class PMA_Tracker
     static private function _changeTracking($dbname, $tablename,
         $version, $new_state
     ) {
-        $common_functions= PMA_CommonFunctions::getInstance();
+        
         $sql_query = " UPDATE " . self::$pma_table .
         " SET `tracking_active` = '" . $new_state . "' " .
         " WHERE `db_name` = '" . PMA_Util::sqlAddSlashes($dbname) . "' " .
diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php
index b1d8c2b858..f7c8b54d5a 100644
--- a/libraries/insert_edit.lib.php
+++ b/libraries/insert_edit.lib.php
@@ -495,8 +495,7 @@ function PMA_getFunctionColumn($column, $is_upload, $column_name_appendix,
             . ' ' . $unnullify_trigger
             . ' tabindex="' . ($tabindex + $tabindex_for_function) . '"'
             . ' id="field_' . $idindex . '_1">';
-        $html_output .= PMA_CommonFunctions::getInstance()
-            ->getFunctionsForField($column, $insert_mode) . "\n";
+        $html_output .= PMA_Util::getFunctionsForField($column, $insert_mode) . "\n";
 
         $html_output .= '</select>' .  "\n";
         $html_output .= '</td>' .  "\n";
@@ -1730,8 +1729,7 @@ function PMA_getSpecialCharsAndBackupFieldForInsertingMode(
         $special_chars = htmlspecialchars($column['Default']);
     }
     $backup_field = '';
-    $special_chars_encoded = PMA_CommonFunctions::getInstance()
-        ->duplicateFirstNewline($special_chars);
+    $special_chars_encoded = PMA_Util::duplicateFirstNewline($special_chars);
     // this will select the UNHEX function while inserting
     if (($column['is_binary'] || ($column['is_blob'] && ! $GLOBALS['cfg']['ProtectBinary']))
         && (isset($_SESSION['tmp_user_values']['display_binary_as_hex'])
diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php
index 7a614d3d97..064c9af5b2 100644
--- a/libraries/rte/rte_routines.lib.php
+++ b/libraries/rte/rte_routines.lib.php
@@ -937,8 +937,7 @@ function PMA_RTN_getEditorForm($mode, $operation, $routine)
     $retval .= "<tr class='routine_return_row$isfunction_class'>\n";
     $retval .= "    <td>" . __('Return type') . "</td>\n";
     $retval .= "    <td><select name='item_returntype'>\n";
-    $retval .= PMA_CommonFunctions::getInstance()
-        ->getSupportedDatatypes(true, $routine['item_returntype']) . "\n";
+    $retval .= PMA_Util::getSupportedDatatypes(true, $routine['item_returntype']) . "\n";
     $retval .= "    </select></td>\n";
     $retval .= "</tr>\n";
     $retval .= "<tr class='routine_return_row$isfunction_class'>\n";
diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php
index 44894d28d9..3bbdca3543 100644
--- a/tbl_zoom_select.php
+++ b/tbl_zoom_select.php
@@ -68,8 +68,7 @@ if (isset($_REQUEST['get_data_row']) && $_REQUEST['get_data_row'] == true) {
         $i = 0;
         foreach ($row as $col => $val) {
             if ($fields_meta[$i]->type == 'bit') {
-                $row[$col] = PMA_CommonFunctions::getInstance()
-                    ->printableBitValue($val, $fields_meta[$i]->length);
+                $row[$col] = PMA_Util::printableBitValue($val, $fields_meta[$i]->length);
             }
             $i++;
         }
diff --git a/test/libraries/common/PMA_buildActionTitles_test.php b/test/libraries/common/PMA_buildActionTitles_test.php
index a1c77526bb..7ce7a1fa0b 100644
--- a/test/libraries/common/PMA_buildActionTitles_test.php
+++ b/test/libraries/common/PMA_buildActionTitles_test.php
@@ -27,27 +27,25 @@ class PMA_buildActionTitles_test extends PHPUnit_Framework_TestCase
     function testBuildActionTitles()
     {
         $titles = array();
-        $common = PMA_CommonFunctions::getInstance();
+        $titles['Browse']     = PMA_Util::getIcon('b_browse.png', __('Browse'));
+        $titles['NoBrowse']   = PMA_Util::getIcon('bd_browse.png', __('Browse'));
+        $titles['Search']     = PMA_Util::getIcon('b_select.png', __('Search'));
+        $titles['NoSearch']   = PMA_Util::getIcon('bd_select.png', __('Search'));
+        $titles['Insert']     = PMA_Util::getIcon('b_insrow.png', __('Insert'));
+        $titles['NoInsert']   = PMA_Util::getIcon('bd_insrow.png', __('Insert'));
+        $titles['Structure']  = PMA_Util::getIcon('b_props.png', __('Structure'));
+        $titles['Drop']       = PMA_Util::getIcon('b_drop.png', __('Drop'));
+        $titles['NoDrop']     = PMA_Util::getIcon('bd_drop.png', __('Drop'));
+        $titles['Empty']      = PMA_Util::getIcon('b_empty.png', __('Empty'));
+        $titles['NoEmpty']    = PMA_Util::getIcon('bd_empty.png', __('Empty'));
+        $titles['Edit']       = PMA_Util::getIcon('b_edit.png', __('Edit'));
+        $titles['NoEdit']     = PMA_Util::getIcon('bd_edit.png', __('Edit'));
+        $titles['Export']     = PMA_Util::getIcon('b_export.png', __('Export'));
+        $titles['NoExport']   = PMA_Util::getIcon('bd_export.png', __('Export'));
+        $titles['Execute']    = PMA_Util::getIcon('b_nextpage.png', __('Execute'));
+        $titles['NoExecute']  = PMA_Util::getIcon('bd_nextpage.png', __('Execute'));
 
-        $titles['Browse']     = $common->getIcon('b_browse.png', __('Browse'));
-        $titles['NoBrowse']   = $common->getIcon('bd_browse.png', __('Browse'));
-        $titles['Search']     = $common->getIcon('b_select.png', __('Search'));
-        $titles['NoSearch']   = $common->getIcon('bd_select.png', __('Search'));
-        $titles['Insert']     = $common->getIcon('b_insrow.png', __('Insert'));
-        $titles['NoInsert']   = $common->getIcon('bd_insrow.png', __('Insert'));
-        $titles['Structure']  = $common->getIcon('b_props.png', __('Structure'));
-        $titles['Drop']       = $common->getIcon('b_drop.png', __('Drop'));
-        $titles['NoDrop']     = $common->getIcon('bd_drop.png', __('Drop'));
-        $titles['Empty']      = $common->getIcon('b_empty.png', __('Empty'));
-        $titles['NoEmpty']    = $common->getIcon('bd_empty.png', __('Empty'));
-        $titles['Edit']       = $common->getIcon('b_edit.png', __('Edit'));
-        $titles['NoEdit']     = $common->getIcon('bd_edit.png', __('Edit'));
-        $titles['Export']     = $common->getIcon('b_export.png', __('Export'));
-        $titles['NoExport']   = $common->getIcon('bd_export.png', __('Export'));
-        $titles['Execute']    = $common->getIcon('b_nextpage.png', __('Execute'));
-        $titles['NoExecute']  = $common->getIcon('bd_nextpage.png', __('Execute'));
-
-        $this->assertEquals($titles, $common->buildActionTitles());
+        $this->assertEquals($titles, PMA_Util::buildActionTitles());
 
     }
 }
diff --git a/test/libraries/common/PMA_quoting_slashing_test.php b/test/libraries/common/PMA_quoting_slashing_test.php
index 9151e8b134..865cf45ef5 100644
--- a/test/libraries/common/PMA_quoting_slashing_test.php
+++ b/test/libraries/common/PMA_quoting_slashing_test.php
@@ -22,16 +22,15 @@ class PMA_quoting_slashing_test extends PHPUnit_Framework_TestCase
     public function testAddSlashes()
     {
         $string = "\'test''\''\'\r\t\n";
-        $common = PMA_CommonFunctions::getInstance();
-
-        $this->assertEquals("\\\\\\\\\'test\'\'\\\\\\\\\'\'\\\\\\\\\'\\r\\t\\n", $common->sqlAddSlashes($string, true, true, true));
-        $this->assertEquals("\\\\\\\\''test''''\\\\\\\\''''\\\\\\\\''\\r\\t\\n", $common->sqlAddSlashes($string, true, true, false));
-        $this->assertEquals("\\\\\\\\\'test\'\'\\\\\\\\\'\'\\\\\\\\\'\r\t\n", $common->sqlAddSlashes($string, true, false, true));
-        $this->assertEquals("\\\\\\\\''test''''\\\\\\\\''''\\\\\\\\''\r\t\n", $common->sqlAddSlashes($string, true, false, false));
-        $this->assertEquals("\\\\\'test\'\'\\\\\'\'\\\\\'\\r\\t\\n", $common->sqlAddSlashes($string, false, true, true));
-        $this->assertEquals("\\\\''test''''\\\\''''\\\\''\\r\\t\\n", $common->sqlAddSlashes($string, false, true, false));
-        $this->assertEquals("\\\\\'test\'\'\\\\\'\'\\\\\'\r\t\n", $common->sqlAddSlashes($string, false, false, true));
-        $this->assertEquals("\\\\''test''''\\\\''''\\\\''\r\t\n", $common->sqlAddSlashes($string, false, false, false));
+        
+        $this->assertEquals("\\\\\\\\\'test\'\'\\\\\\\\\'\'\\\\\\\\\'\\r\\t\\n", PMA_Util::sqlAddSlashes($string, true, true, true));
+        $this->assertEquals("\\\\\\\\''test''''\\\\\\\\''''\\\\\\\\''\\r\\t\\n", PMA_Util::sqlAddSlashes($string, true, true, false));
+        $this->assertEquals("\\\\\\\\\'test\'\'\\\\\\\\\'\'\\\\\\\\\'\r\t\n", PMA_Util::sqlAddSlashes($string, true, false, true));
+        $this->assertEquals("\\\\\\\\''test''''\\\\\\\\''''\\\\\\\\''\r\t\n", PMA_Util::sqlAddSlashes($string, true, false, false));
+        $this->assertEquals("\\\\\'test\'\'\\\\\'\'\\\\\'\\r\\t\\n", PMA_Util::sqlAddSlashes($string, false, true, true));
+        $this->assertEquals("\\\\''test''''\\\\''''\\\\''\\r\\t\\n", PMA_Util::sqlAddSlashes($string, false, true, false));
+        $this->assertEquals("\\\\\'test\'\'\\\\\'\'\\\\\'\r\t\n", PMA_Util::sqlAddSlashes($string, false, false, true));
+        $this->assertEquals("\\\\''test''''\\\\''''\\\\''\r\t\n", PMA_Util::sqlAddSlashes($string, false, false, false));
     }
 
     /**