diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index 15e6c452a..dfb2f9fae 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -146,7 +146,6 @@ define([
     Pages.docsLink = footLink('https://docs.cryptpad.fr', 'docs_link');
     Pages.roadmapLink = footLink(customURLs.roadmap, 'footer_roadmap');
 
-    Msg.footer_website = "Project Website"; // XXX
 
     Pages.infopageFooter = function () {
         return h('footer.cp-footer', [
diff --git a/customize.dist/pages/contact.js b/customize.dist/pages/contact.js
index 7bfb17f0a..eafd3d01b 100644
--- a/customize.dist/pages/contact.js
+++ b/customize.dist/pages/contact.js
@@ -15,9 +15,6 @@ define([
         ].indexOf(Config.adminEmail) === -1;
         var adminMailbox = Config.supportMailbox && LocalStore.isLoggedIn();
 
-        // XXX: existing key to update
-        Msg.contact_admin = "Contact the administrators for: {0}"; // XXX DB: add instance title
-
         return h('div#cp-main', [
             Pages.infopageTopbar(),
             h('div.container.cp-container', [
diff --git a/customize.dist/pages/index.js b/customize.dist/pages/index.js
index 9f4919d63..c19da3fe2 100644
--- a/customize.dist/pages/index.js
+++ b/customize.dist/pages/index.js
@@ -108,9 +108,7 @@ define([
 
         var fastLink = k => pageLink(Pages.customURLs[k], k);
 
-        // XXX DB
         Msg.terms = Msg.footer_tos; //"Terms of Service"; // XXX
-        Msg.home_location = "Encrypted data is hosted in {0}"; // XXX
 
         var imprintLink = fastLink('imprint');
         var privacyLink = fastLink('privacy');
@@ -128,7 +126,7 @@ define([
 
         // instance title
         var instanceTitle = h('h1.cp-instance-title', Pages.Instance.name);
-        // XXX DB: How does TextFit work?!
+        // DB: How does TextFit work?!
         // setTimeout(function () {
         //     TextFit(instanceTitle, {minFontSize: 13, maxFontSize: 48}); // XXX DB remove?
         // });
@@ -144,8 +142,6 @@ define([
             locationBlock = h('div', h('br'));
         }
 
-        Msg.home_morestorage = 'For more storage space:'; // XXX
-
         var subButton = function () {
             if (Pages.areSubscriptionsAllowed()) {
                 var sub = h('div.cp-sub-prompt', [
diff --git a/customize.dist/pages/login.js b/customize.dist/pages/login.js
index 996936df4..a4b452ffc 100644
--- a/customize.dist/pages/login.js
+++ b/customize.dist/pages/login.js
@@ -5,7 +5,6 @@ define([
     '/customize/pages.js',
     '/api/config',
 ], function (h, UI, Msg, Pages, Config) {
-    Msg.login_instance = "Connect to your account on {0}"; // XXX DB highlight instance name?
     return function () {
         document.title = Msg.login_login;
         return [h('div#cp-main', [
diff --git a/customize.dist/pages/register.js b/customize.dist/pages/register.js
index 7a662d029..1a86bed32 100644
--- a/customize.dist/pages/register.js
+++ b/customize.dist/pages/register.js
@@ -45,8 +45,6 @@ define([
             termsCheck = h('div.checkbox-container', tos);
         }
 
-        Msg.register_instance = "Creating a new account on {0}"; // XXX DB
-
         return frame([
             h('div.row.cp-register-det', [
                 h('div#data.hidden.col-md-6', [
diff --git a/www/admin/inner.js b/www/admin/inner.js
index 369a1bc42..eaafe0ba3 100644
--- a/www/admin/inner.js
+++ b/www/admin/inner.js
@@ -469,8 +469,6 @@ define([
         return $div;
     };
 
-    Messages.admin_noticeTitle = "Home page notice"; // XXX
-    Messages.admin_noticeHint = "An optional message to display on the home page"; // XXX
 
     create['notice'] = function () { // XXX make translateable
         var key = 'notice';