diff --git a/core/server/data/migration/index.js b/core/server/data/migration/index.js
index fad4a9f86c3..8b62da0dd1c 100644
--- a/core/server/data/migration/index.js
+++ b/core/server/data/migration/index.js
@@ -34,7 +34,6 @@ function getDatabaseVersion() {
         // Check for the current version from the settings table
         if (exists) {
             // Temporary code to deal with old databases with currentVersion settings
-            // TODO: remove before release
             return knex('settings')
                 .where('key', 'databaseVersion')
                 .orWhere('key', 'currentVersion')
diff --git a/core/server/models/settings.js b/core/server/models/settings.js
index 6c55e2cc994..ba6206a46d3 100644
--- a/core/server/models/settings.js
+++ b/core/server/models/settings.js
@@ -109,7 +109,6 @@ Settings = GhostBookshelf.Model.extend({
             _.each(defaultSettings, function (defaultSetting, defaultSettingKey) {
                 var isMissingFromDB = usedKeys.indexOf(defaultSettingKey) === -1;
                 // Temporary code to deal with old databases with currentVersion settings
-                // TODO: remove before release
                 if (defaultSettingKey === 'databaseVersion' && usedKeys.indexOf('currentVersion') !== -1) {
                     isMissingFromDB = false;
                 }