diff --git a/database_mysql_dump.inc b/database_mysql_dump.inc
index 372c69125375218baae9370aa193c75debb87367..83d2ed6dc1b91e84ee7cf799a63a4d15f485916e 100644
--- a/database_mysql_dump.inc
+++ b/database_mysql_dump.inc
@@ -161,12 +161,6 @@ function _demo_dump_table_schema($fp, $table) {
   // utf8_general_ci as default database collation, if not overridden via
   // settings.php.
   if (!strpos($output, 'COLLATE=')) {
-    // Only if the collation contains a underscore, the first string up to the
-    // first underscore is the character set.
-    // @see PMA_exportDBCreate()
-    if (strpos($status['collation'], '_')) {
-      //$collate = 'COLLATE=' . $status['collation'];
-    }
     // If there is a character set defined already, just append the collation.
     // Only look for the table definition (on the last line); column definitions
     // may use a special collation, which must not be changed.
diff --git a/demo.admin.js b/demo.admin.js
index 82545165ccbc3e6ce800ca9f5b56df34e3bb4ec3..4276c6403efef11214d65b3350de2b40e536a8a7 100644
--- a/demo.admin.js
+++ b/demo.admin.js
@@ -1,3 +1,7 @@
+/**
+ * @file
+ */
+
 (function ($) {
 
 /**