diff --git a/htdocs/sql/libraries/bookmark.lib.php b/htdocs/sql/libraries/bookmark.lib.php
deleted file mode 100755
--- a/htdocs/sql/libraries/bookmark.lib.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Set of functions used with the bookmark feature
- *
- * @version $Id: bookmark.lib.php 11163 2008-03-16 11:28:18Z lem9 $
- */
-
-
-/**
- * Defines the bookmark parameters for the current user
- *
- * @return  array    the bookmark parameters for the current user
- *
- * @global  integer  the id of the current server
- *
- * @access  public
- */
-function PMA_getBookmarksParam()
-{
-    global $server;
-
-    $cfgBookmark = '';
-
-    // No server selected -> no bookmark table
-    if ($server == 0) {
-        return '';
-    }
-
-    $cfgBookmark['user']  = $GLOBALS['cfg']['Server']['user'];
-    $cfgBookmark['db']    = $GLOBALS['cfg']['Server']['pmadb'];
-    $cfgBookmark['table'] = $GLOBALS['cfg']['Server']['bookmarktable'];
-
-    return $cfgBookmark;
-} // end of the 'PMA_getBookmarksParam()' function
-
-
-/**
- * Gets the list of bookmarks defined for the current database
- *
- * @global  resource  the controluser db connection handle
- *
- * @param   string    the current database name
- * @param   array     the bookmark parameters for the current user
- *
- * @return  mixed     the bookmarks list if defined, false else
- *
- * @access  public
- */
-function PMA_listBookmarks($db, $cfgBookmark)
-{
-    global $controllink;
-
-    if (empty($cfgBookmark['db']) || empty($cfgBookmark['table'])) {
-        return '';
-    }
-
-    $query  = 'SELECT label, id FROM '. PMA_backquote($cfgBookmark['db']) . '.' . PMA_backquote($cfgBookmark['table'])
-            . ' WHERE dbase = \'' . PMA_sqlAddslashes($db) . '\''
-            . ' AND (user = \'' . PMA_sqlAddslashes($cfgBookmark['user']) . '\''
-            . '      OR user = \'\')'
-            . ' ORDER BY label';
-    $result = PMA_DBI_query($query, $controllink, PMA_DBI_QUERY_STORE);
-
-    // There are some bookmarks -> store them
-    // use the unique id as the key
-    if ($result && PMA_DBI_num_rows($result) > 0) {
-        while ($row = PMA_DBI_fetch_row($result)) {
-            $bookmark_list[$row[1]] = $row[0];
-        } // end while
-        return $bookmark_list;
-    }
-    // No bookmarks for the current database
-    else {
-        return FALSE;
-    }
-} // end of the 'PMA_listBookmarks()' function
-
-
-/**
- * Gets the sql command from a bookmark
- *
- * @global  resource  the controluser db connection handle
- *
- * @param   string    the current database name
- * @param   array     the bookmark parameters for the current user
- * @param   mixed     the id of the bookmark to get
- * @param   string    which field to look up the $id
- * @param   boolean  TRUE: get all bookmarks regardless of the owning user
- *
- * @return  string    the sql query
- *
- * @access  public
- */
-function PMA_queryBookmarks($db, $cfgBookmark, $id, $id_field = 'id', $action_bookmark_all = FALSE)
-{
-    global $controllink;
-
-    if (empty($cfgBookmark['db']) || empty($cfgBookmark['table'])) {
-        return '';
-    }
-
-    $query          = 'SELECT query FROM ' . PMA_backquote($cfgBookmark['db']) . '.' . PMA_backquote($cfgBookmark['table'])
-                    . ' WHERE dbase = \'' . PMA_sqlAddslashes($db) . '\''
-                    . ($action_bookmark_all? '' : ' AND (user = \'' . PMA_sqlAddslashes($cfgBookmark['user']) . '\''
-                    . '      OR user = \'\')')
-                    . ' AND ' . PMA_backquote($id_field) . ' = ' . $id;
-    $result = PMA_DBI_try_query($query, $controllink);
-    if (!$result) {
-        return FALSE;
-    }
-    list($bookmark_query) = PMA_DBI_fetch_row($result) or array(FALSE);
-
-    return $bookmark_query;
-} // end of the 'PMA_queryBookmarks()' function
-
-/**
- * Adds a bookmark
- *
- * @global  resource  the controluser db connection handle
- *
- * @param   array     the properties of the bookmark to add
- * @param   array     the bookmark parameters for the current user
- * @param   boolean   whether to make the bookmark available for all users
- *
- * @return  boolean   whether the INSERT succeeds or not
- *
- * @access  public
- */
-function PMA_addBookmarks($fields, $cfgBookmark, $all_users = false)
-{
-    global $controllink;
-
-    $query = 'INSERT INTO ' . PMA_backquote($cfgBookmark['db']) . '.' . PMA_backquote($cfgBookmark['table'])
-           . ' (id, dbase, user, query, label) VALUES (NULL, \'' . PMA_sqlAddslashes($fields['dbase']) . '\', \'' . ($all_users ? '' : PMA_sqlAddslashes($fields['user'])) . '\', \'' . PMA_sqlAddslashes(urldecode($fields['query'])) . '\', \'' . PMA_sqlAddslashes($fields['label']) . '\')';
-    $result   = PMA_DBI_query($query, $controllink);
-
-    return TRUE;
-} // end of the 'PMA_addBookmarks()' function
-
-
-/**
- * Deletes a bookmark
- *
- * @global  resource  the controluser db connection handle
- *
- * @param   string   the current database name
- * @param   array    the bookmark parameters for the current user
- * @param   integer  the id of the bookmark to get
- *
- * @access  public
- */
-function PMA_deleteBookmarks($db, $cfgBookmark, $id)
-{
-    global $controllink;
-
-    $query  = 'DELETE FROM ' . PMA_backquote($cfgBookmark['db']) . '.' . PMA_backquote($cfgBookmark['table'])
-            . ' WHERE (user = \'' . PMA_sqlAddslashes($cfgBookmark['user']) . '\''
-            . '        OR user = \'\')'
-            . ' AND id = ' . $id;
-    $result = PMA_DBI_try_query($query, $controllink);
-} // end of the 'PMA_deleteBookmarks()' function
-
-
-/**
- * Bookmark Support
- */
-
-if (! isset($GLOBALS['cfgRelation'])) {
-    require_once './libraries/relation.lib.php';
-    $GLOBALS['cfgRelation'] = PMA_getRelationsParam();
-}
-
-if ($GLOBALS['cfgRelation']['bookmarkwork']) {
-    $cfg['Bookmark'] = PMA_getBookmarksParam();
-} else {
-    $cfg['Bookmark'] = array();
-}
-
-?>