diff --git a/js/functions.js b/js/functions.js
index 13713cc15f..a7975aec48 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1704,7 +1704,8 @@ function PMA_createProfilingChartJqplot(target, data)
 }
 
 /**
- * Formats a profiling duration nicely (in us and ms time). Used in server_status.js
+ * Formats a profiling duration nicely (in us and ms time).
+ * Used in server_status_monitor.js
  *
  * @param  integer    Number to be formatted, should be in the range of microsecond to second
  * @param  integer    Accuracy, how many numbers right to the comma should be
diff --git a/js/messages.php b/js/messages.php
index 4a0df5271d..e64d9f9bea 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -57,15 +57,6 @@ $js_messages['strReloadingPrivileges'] = __('Reloading Privileges');
 $js_messages['strRemovingSelectedUsers'] = __('Removing Selected Users');
 $js_messages['strClose'] = __('Close');
 
-/* for server_status.js */
-$js_messages['strEdit'] = __('Edit');
-$js_messages['strLiveTrafficChart'] = __('Live traffic chart');
-$js_messages['strLiveConnChart'] = __('Live conn./process chart');
-$js_messages['strLiveQueryChart'] = __('Live query chart');
-
-$js_messages['strStaticData'] = __('Static data');
-/* l10n: Total number of queries */
-$js_messages['strTotal'] = __('Total');
 /* l10n: Other, small valued, queries */
 $js_messages['strOther'] = __('Other');
 /* l10n: Thousands separator */
diff --git a/js/server_status.js b/js/server_status.js
deleted file mode 100644
index 0bb534c02f..0000000000
--- a/js/server_status.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * @fileoverview    functions used in server status pages
- * @name            Server Status
- */
-
-var pma_token,
-    url_query,
-    server_time_diff,
-    server_os,
-    is_superuser,
-    server_db_isLocal;
-
-// Add a tablesorter parser to properly handle thousands seperated numbers and SI prefixes
-AJAX.registerOnload('server_status.js', function () {
-
-    var $js_data_form = $('#js_data');
-    pma_token =         $js_data_form.find("input[name=pma_token]").val();
-    url_query =         $js_data_form.find("input[name=url_query]").val();
-    server_time_diff  = eval($js_data_form.find("input[name=server_time_diff]").val());
-    server_os =         $js_data_form.find("input[name=server_os]").val();
-    is_superuser =      $js_data_form.find("input[name=is_superuser]").val();
-    server_db_isLocal = $js_data_form.find("input[name=server_db_isLocal]").val();
-
-});