diff --git a/lib/dml/mysqli_native_moodle_database.php b/lib/dml/mysqli_native_moodle_database.php
index c24d13669ab..30fe8463056 100644
--- a/lib/dml/mysqli_native_moodle_database.php
+++ b/lib/dml/mysqli_native_moodle_database.php
@@ -44,7 +44,6 @@ class mysqli_native_moodle_database extends moodle_database {
      * @return bool success
      * @throws dml_exception if error
      */
-    /// TODO: Decide if this method should go to DDL instead of being here
     public function create_database($dbhost, $dbuser, $dbpass, $dbname, array $dboptions=null) {
         $driverstatus = $this->driver_installed();
 
diff --git a/lib/dml/pgsql_native_moodle_database.php b/lib/dml/pgsql_native_moodle_database.php
index 23f9d1ad69d..07631fe5a7f 100644
--- a/lib/dml/pgsql_native_moodle_database.php
+++ b/lib/dml/pgsql_native_moodle_database.php
@@ -83,7 +83,7 @@ class pgsql_native_moodle_database extends moodle_database {
      * @return string
      */
     public function get_name() {
-        return get_string('nativepgsql', 'install'); // TODO: localise
+        return get_string('nativepgsql', 'install');
     }
 
     /**
@@ -101,7 +101,7 @@ class pgsql_native_moodle_database extends moodle_database {
      * @return string
      */
     public function get_configuration_hints() {
-        return get_string('databasesettingssub_postgres7', 'install'); // TODO: improve
+        return get_string('databasesettingssub_postgres7', 'install');
     }
 
     /**
@@ -360,7 +360,6 @@ class pgsql_native_moodle_database extends moodle_database {
             $matches = null;
 
             if ($rawcolumn->type === 'varchar') {
-                //TODO add some basic enum support here
                 $info->type          = 'varchar';
                 $info->meta_type     = 'C';
                 $info->max_length    = $rawcolumn->atttypmod - 4;
@@ -1089,7 +1088,7 @@ class pgsql_native_moodle_database extends moodle_database {
     }
 
     public function get_session_lock($rowid) {
-        // TODO: there is a potential locking problem for database running
+        // NOTE: there is a potential locking problem for database running
         //       multiple instances of moodle, we could try to use pg_advisory_lock(int, int),
         //       luckily there is not a big chance that they would collide
         if (!$this->session_lock_supported()) {