diff --git a/admin/xmldb/actions/create_xml_file/create_xml_file.class.php b/admin/xmldb/actions/create_xml_file/create_xml_file.class.php
index 8cc6390c86a..dc4a9d0e272 100644
--- a/admin/xmldb/actions/create_xml_file/create_xml_file.class.php
+++ b/admin/xmldb/actions/create_xml_file/create_xml_file.class.php
@@ -82,10 +82,10 @@ class create_xml_file extends XMLDBAction {
         $c.= '    <TABLES>' . "\n";
         $c.= '      <TABLE NAME="' . $xmltable . '" COMMENT="Default comment for ' . $xmltable .', please edit me">' . "\n";
         $c.= '        <FIELDS>' . "\n";
-        $c.= '          <FIELD NAME="id" TYPE="int" LENGTH="10" UNSIGNED="true" NOTNULL="true" SEQUENCE="true" COMMENT="id of the table, please edit me" />' . "\n";
+        $c.= '          <FIELD NAME="id" TYPE="int" LENGTH="10" UNSIGNED="true" NOTNULL="true" SEQUENCE="true" />' . "\n";
         $c.= '        </FIELDS>' . "\n";
         $c.= '        <KEYS>' . "\n";
-        $c.= '          <KEY NAME="primary" COMMENT="Primary key for ' . $xmltable . '" TYPE="primary" FIELDS="id" />' . "\n";
+        $c.= '          <KEY NAME="primary" TYPE="primary" FIELDS="id" />' . "\n";
         $c.= '        </KEYS>' . "\n";
         $c.= '      </TABLE>' . "\n";
         $c.= '    </TABLES>' . "\n";
diff --git a/admin/xmldb/actions/new_field/new_field.class.php b/admin/xmldb/actions/new_field/new_field.class.php
index d590a355b78..4384dc51e0e 100644
--- a/admin/xmldb/actions/new_field/new_field.class.php
+++ b/admin/xmldb/actions/new_field/new_field.class.php
@@ -89,7 +89,6 @@ class new_field extends XMLDBAction {
         }
         if (!$changeme_exists) { /// Lets create the field
             $field = new XMLDBField('changeme');
-            $field->setComment('Default comment for the field, please edit me');
             $table->addField($field);
 
         /// We have one new field, so the structure has changed
diff --git a/admin/xmldb/actions/new_index/new_index.class.php b/admin/xmldb/actions/new_index/new_index.class.php
index 08decba3156..80eeb4284c8 100644
--- a/admin/xmldb/actions/new_index/new_index.class.php
+++ b/admin/xmldb/actions/new_index/new_index.class.php
@@ -89,7 +89,6 @@ class new_index extends XMLDBAction {
         }
         if (!$changeme_exists) { /// Lets create the Index
             $index = new XMLDBIndex('changeme');
-            $index->setComment('Default comment for the index, please edit me');
             $table->addIndex($index);
 
         /// We have one new key, so the structure has changed
diff --git a/admin/xmldb/actions/new_key/new_key.class.php b/admin/xmldb/actions/new_key/new_key.class.php
index 8b720bdfdcb..7a00cfc083c 100644
--- a/admin/xmldb/actions/new_key/new_key.class.php
+++ b/admin/xmldb/actions/new_key/new_key.class.php
@@ -89,7 +89,6 @@ class new_key extends XMLDBAction {
         }
         if (!$changeme_exists) { /// Lets create the Key
             $key = new XMLDBKey('changeme');
-            $key->setComment('Default comment for the key, please edit me');
             $table->addKey($key);
 
         /// We have one new key, so the structure has changed
diff --git a/admin/xmldb/actions/new_table/new_table.class.php b/admin/xmldb/actions/new_table/new_table.class.php
index 6a6b2736d91..7c01d14e635 100644
--- a/admin/xmldb/actions/new_table/new_table.class.php
+++ b/admin/xmldb/actions/new_table/new_table.class.php
@@ -90,14 +90,12 @@ class new_table extends XMLDBAction {
             $field->setNotNull(true);
             $field->setUnsigned(true);
             $field->setSequence(true);
-            $field->setComment('id of the table, please edit me');
             $field->setLoaded(true);
             $field->setChanged(true);
 
             $key = new XMLDBKey('primary');
             $key->setType(XMLDB_KEY_PRIMARY);
             $key->setFields(array('id'));
-            $key->setComment('primary key of the table, please edit me');
             $key->setLoaded(true);
             $key->setChanged(true);