diff --git a/libraries/relation_cleanup.lib.php b/libraries/relation_cleanup.lib.php
index 89a7584cd..092311c4e 100644
--- a/libraries/relation_cleanup.lib.php
+++ b/libraries/relation_cleanup.lib.php
@@ -10,148 +10,133 @@
  *
  */
 require_once './libraries/relation.lib.php';
-$cfgRelation = PMA_getRelationsParam();
 
-function PMA_relationsCleanupColumn($db, $table, $column) {
-    global $cfgRelation;
+function PMA_relationsCleanupColumn($db, $table, $column)
+{
+    $cfgRelation = PMA_getRelationsParam();
+    
     if ($cfgRelation['commwork']) {
-        $remove_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['column_info'])
+        $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info'])
                     . ' WHERE db_name  = \'' . PMA_sqlAddslashes($db) . '\''
                     . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\''
                     . ' AND column_name = \'' . PMA_sqlAddslashes($column) . '\'';
-        $rmv_rs    = PMA_query_as_cu($remove_query);
-        unset($remove_query);
+        PMA_query_as_cu($remove_query);
     }
 
     if ($cfgRelation['displaywork']) {
-        $remove_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_info'])
+        $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['table_info'])
                     . ' WHERE db_name  = \'' . PMA_sqlAddslashes($db) . '\''
                     . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\''
                     . ' AND display_field = \'' . PMA_sqlAddslashes($column) . '\'';
-        $rmv_rs    = PMA_query_as_cu($remove_query);
-        unset($remove_query);
+        PMA_query_as_cu($remove_query);
     }
 
     if ($cfgRelation['relwork']) {
-        $remove_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['relation'])
+        $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['relation'])
                     . ' WHERE master_db  = \'' . PMA_sqlAddslashes($db) . '\''
                     . ' AND master_table = \'' . PMA_sqlAddslashes($table) . '\''
                     . ' AND master_field = \'' . PMA_sqlAddslashes($column) . '\'';
-        $rmv_rs    = PMA_query_as_cu($remove_query);
-        unset($remove_query);
+        PMA_query_as_cu($remove_query);
 
-        $remove_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['relation'])
+        $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['relation'])
                     . ' WHERE foreign_db  = \'' . PMA_sqlAddslashes($db) . '\''
                     . ' AND foreign_table = \'' . PMA_sqlAddslashes($table) . '\''
                     . ' AND foreign_field = \'' . PMA_sqlAddslashes($column) . '\'';
-        $rmv_rs    = PMA_query_as_cu($remove_query);
-        unset($remove_query);
+        PMA_query_as_cu($remove_query);
     }
 }
 
-function PMA_relationsCleanupTable($db, $table) {
-    global $cfgRelation;
+function PMA_relationsCleanupTable($db, $table)
+{
+    $cfgRelation = PMA_getRelationsParam();
 
     if ($cfgRelation['commwork']) {
-            $remove_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['column_info'])
-                        . ' WHERE db_name  = \'' . PMA_sqlAddslashes($db) . '\''
-                        . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\'';
-            $rmv_rs    = PMA_query_as_cu($remove_query);
-            unset($remove_query);
+        $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info'])
+                    . ' WHERE db_name  = \'' . PMA_sqlAddslashes($db) . '\''
+                    . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\'';
+        PMA_query_as_cu($remove_query);
     }
 
     if ($cfgRelation['displaywork']) {
-        $remove_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_info'])
+        $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['table_info'])
                     . ' WHERE db_name  = \'' . PMA_sqlAddslashes($db) . '\''
                     . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\'';
-        $rmv_rs    = PMA_query_as_cu($remove_query);
-        unset($remove_query);
+        PMA_query_as_cu($remove_query);
     }
 
     if ($cfgRelation['pdfwork']) {
-        $remove_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords'])
+        $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['table_coords'])
                     . ' WHERE db_name  = \'' . PMA_sqlAddslashes($db) . '\''
                     . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\'';
-        $rmv_rs    = PMA_query_as_cu($remove_query);
-        unset($remove_query);
+        PMA_query_as_cu($remove_query);
     }
 
     if ($cfgRelation['designerwork']) {
-        $remove_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['designer_coords'])
+        $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['designer_coords'])
                     . ' WHERE db_name  = \'' . PMA_sqlAddslashes($db) . '\''
                     . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\'';
-        $rmv_rs    = PMA_query_as_cu($remove_query);
-        unset($remove_query);
+        PMA_query_as_cu($remove_query);
     }
 
     if ($cfgRelation['relwork']) {
-        $remove_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['relation'])
+        $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['relation'])
                     . ' WHERE master_db  = \'' . PMA_sqlAddslashes($db) . '\''
                     . ' AND master_table = \'' . PMA_sqlAddslashes($table) . '\'';
-        $rmv_rs    = PMA_query_as_cu($remove_query);
-        unset($remove_query);
+        PMA_query_as_cu($remove_query);
 
-        $remove_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['relation'])
+        $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['relation'])
                     . ' WHERE foreign_db  = \'' . PMA_sqlAddslashes($db) . '\''
                     . ' AND foreign_table = \'' . PMA_sqlAddslashes($table) . '\'';
-        $rmv_rs    = PMA_query_as_cu($remove_query);
-        unset($remove_query);
+        PMA_query_as_cu($remove_query);
     }
 }
 
-function PMA_relationsCleanupDatabase($db) {
-    global $cfgRelation;
+function PMA_relationsCleanupDatabase($db)
+{
+    $cfgRelation = PMA_getRelationsParam();
 
     if ($cfgRelation['commwork']) {
-        $remove_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['column_info'])
+        $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info'])
                     . ' WHERE db_name  = \'' . PMA_sqlAddslashes($db) . '\'';
-        $rmv_rs    = PMA_query_as_cu($remove_query);
-        unset($remove_query);
+        PMA_query_as_cu($remove_query);
     }
 
     if ($cfgRelation['bookmarkwork']) {
-        $remove_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['bookmark'])
+        $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['bookmark'])
                     . ' WHERE dbase  = \'' . PMA_sqlAddslashes($db) . '\'';
-        $rmv_rs    = PMA_query_as_cu($remove_query);
-        unset($remove_query);
+        PMA_query_as_cu($remove_query);
     }
 
     if ($cfgRelation['displaywork']) {
-        $remove_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_info'])
+        $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['table_info'])
                     . ' WHERE db_name  = \'' . PMA_sqlAddslashes($db) . '\'';
-        $rmv_rs    = PMA_query_as_cu($remove_query);
-        unset($remove_query);
+        PMA_query_as_cu($remove_query);
     }
 
     if ($cfgRelation['pdfwork']) {
-        $remove_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages'])
+        $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages'])
                     . ' WHERE db_name  = \'' . PMA_sqlAddslashes($db) . '\'';
-        $rmv_rs    = PMA_query_as_cu($remove_query);
-        unset($remove_query);
+        PMA_query_as_cu($remove_query);
 
-        $remove_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords'])
+        $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['table_coords'])
                     . ' WHERE db_name  = \'' . PMA_sqlAddslashes($db) . '\'';
-        $rmv_rs    = PMA_query_as_cu($remove_query);
-        unset($remove_query);
+        PMA_query_as_cu($remove_query);
     }
 
     if ($cfgRelation['designerwork']) {
-        $remove_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['designer_coords'])
+        $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['designer_coords'])
                     . ' WHERE db_name  = \'' . PMA_sqlAddslashes($db) . '\'';
-        $rmv_rs    = PMA_query_as_cu($remove_query);
-        unset($remove_query);
+        PMA_query_as_cu($remove_query);
      }
 
     if ($cfgRelation['relwork']) {
-        $remove_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['relation'])
+        $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['relation'])
                     . ' WHERE master_db  = \'' . PMA_sqlAddslashes($db) . '\'';
-        $rmv_rs    = PMA_query_as_cu($remove_query);
-        unset($remove_query);
+        PMA_query_as_cu($remove_query);
 
-        $remove_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['relation'])
+        $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['relation'])
                     . ' WHERE foreign_db  = \'' . PMA_sqlAddslashes($db) . '\'';
-        $rmv_rs    = PMA_query_as_cu($remove_query);
-        unset($remove_query);
+        PMA_query_as_cu($remove_query);
     }
 }