diff --git a/customize.dist/loading.js b/customize.dist/loading.js
index 9ac40d40e..b20b46f77 100644
--- a/customize.dist/loading.js
+++ b/customize.dist/loading.js
@@ -9,8 +9,6 @@ define([
     var elem = document.createElement('div');
     elem.setAttribute('id', 'cp-loading');
 
-    Messages.label_logo = "CryptPad logo"; // XXX Logo
-
     elem.innerHTML = [
         '<div class="cp-loading-logo">',
             '<img class="cp-loading-cryptofist" src="/customize/CryptPad_logo.svg?' + urlArgs + '" alt="' + Messages.label_logo + '">',
diff --git a/customize.dist/login.js b/customize.dist/login.js
index 0c139796b..a109e19c4 100644
--- a/customize.dist/login.js
+++ b/customize.dist/login.js
@@ -605,7 +605,6 @@ define([
                                 break;
                             case 'INVAL_USER':
                                 UI.removeLoadingScreen(function () {
-                                    Messages.login_notFilledUser = 'Please fill in a username'; // XXX
                                     UI.alert(Messages.login_notFilledUser , function () {
                                         hashing = false;
                                         $('#password').focus();
@@ -625,7 +624,6 @@ define([
                                 break;
                             case 'INVAL_PASS':
                                 UI.removeLoadingScreen(function () {
-                                    Messages.login_notFilledPass = 'Please fill in a password'; // XXX
                                     UI.alert(Messages.login_notFilledPass, function () {
                                         hashing = false;
                                         $('#password').focus();
diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index 912479b69..03cafb93f 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -64,7 +64,6 @@ define([
             if (selected === l) { attr.selected = 'selected'; }
             return h('option', attr, languages[l]);
         });
-        Msg.selectLanguage = "Select a language"; // XXX
         var select = h('select', { 'aria-label': Msg.selectLanguage }, options);
         $(select).change(function () {
             Language.setLanguage($(select).val() || '', null, function () {
diff --git a/customize.dist/pages/login.js b/customize.dist/pages/login.js
index d35a27777..3c71ea1dd 100644
--- a/customize.dist/pages/login.js
+++ b/customize.dist/pages/login.js
@@ -17,7 +17,7 @@ define([
                         h('div.cp-login-instance', Msg._getKey('login_instance', [ Pages.Instance.name ])),
                         h('div.big-container', [
                             h('div.input-container', [
-                                h('label.cp-default-label', { for: 'name' }, Msg.login_username), // XXX label not visible
+                                h('label.cp-default-label', { for: 'name' }, Msg.login_username),
                                 h('input.form-control#name', {
                                     name: 'name',
                                     type: 'text',
@@ -30,7 +30,7 @@ define([
                                 }),
                             ]),
                             h('div.input-container', [
-                                h('label.cp-default-label', { for: 'password' }, Msg.login_password), // XXX label not visible
+                                h('label.cp-default-label', { for: 'password' }, Msg.login_password),
                                 h('input.form-control#password', {
                                     type: 'password',
                                     'name': 'password',
diff --git a/customize.dist/pages/recovery.js b/customize.dist/pages/recovery.js
index beb8f0f0e..3e584625c 100644
--- a/customize.dist/pages/recovery.js
+++ b/customize.dist/pages/recovery.js
@@ -29,7 +29,7 @@ define([
                         h('div.alert.alert-danger.wrong-cred.cp-hidden', Msg.login_noSuchUser),
                         h('div.big-container', [
                             h('div.input-container', [
-                                h('label.cp-default-label', {for: 'username'}, Msg.login_username), // XXX label not visible
+                                h('label.cp-default-label', {for: 'username'}, Msg.login_username),
                                 h('input.form-control#username', {
                                     type: 'text',
                                     autocomplete: 'off',
@@ -41,7 +41,7 @@ define([
                                 }),
                             ]),
                             h('div.input-container', [
-                                h('label.cp-default-label', {for: 'password'}, Msg.login_password), // XXX label not visible
+                                h('label.cp-default-label', {for: 'password'}, Msg.login_password),
                                 h('input.form-control#password', {
                                     type: 'password',
                                     placeholder: Msg.login_password,
@@ -53,7 +53,7 @@ define([
                         )
                     ]),
                     h('div.cp-recovery-step.step2', {style: 'display: none;'}, [
-                        h('label', Msg.recovery_mfa_secret), // XXX label not visible
+                        h('label', Msg.recovery_mfa_secret),
                         h('input.form-control#mfarecovery', {
                             type: 'text',
                             autocomplete: 'off',
diff --git a/customize.dist/pages/register.js b/customize.dist/pages/register.js
index ffcb4a569..a34aad460 100644
--- a/customize.dist/pages/register.js
+++ b/customize.dist/pages/register.js
@@ -71,14 +71,14 @@ define([
                                 }),
                             ]),
                             h('div.input-container', [
-                                h('label.cp-register-label', { for: 'password' }, Msg.login_password), // XXX label not visible
+                                h('label.cp-register-label', { for: 'password' }, Msg.login_password),
                                 h('input.form-control#password', {
                                     type: 'password',
                                     placeholder: Msg.login_password,
                                 }),
                             ]),
                             h('div.input-container', [
-                                h('label.cp-register-label', { for: 'password-confirm' }, Msg.login_confirm), // XXX label not visible
+                                h('label.cp-register-label', { for: 'password-confirm' }, Msg.login_confirm),
                                 h('input.form-control#password-confirm', {
                                     type: 'password',
                                     placeholder: Msg.login_confirm,
diff --git a/lib/storage/blob.js b/lib/storage/blob.js
index b0b79dbce..96e8536f9 100644
--- a/lib/storage/blob.js
+++ b/lib/storage/blob.js
@@ -744,7 +744,6 @@ BlobStore.create = function (config, _cb) {
                         var cb = Util.once(Util.mkAsync(_cb));
                         listBlobs(prependArchive(Env, Env.blobPath), handler, cb);
                     },
-                    // XXX activity
                 }
             },
         };
diff --git a/www/admin/inner.js b/www/admin/inner.js
index 3100ccd53..4f7f0f50f 100644
--- a/www/admin/inner.js
+++ b/www/admin/inner.js
@@ -53,20 +53,6 @@ define([
     var common;
     var sFrameChan;
 
-// XXX
-// TO DELETE
-// Messages.admin_archivePinLog
-// Messages.admin_restoreArchivedPins
-// TO ADD
-Messages.admin_archiveAccount = "Archive this account";
-Messages.admin_archiveAccountInfo = "Including its owned documents";
-Messages.admin_archiveAccountConfirm = "Please specify the reason for archival, this will be shown to the user.";
-Messages.admin_restoreAccount = "Restore this account";
-Messages.admin_accountSuspended = "Account archived by admin";
-Messages.admin_accountReport = "Account archive report";
-Messages.admin_accountReportFull = "Get detailed report";
-Messages.admin_channelPlaceholder = "Destroyed document placeholder";
-
     var categories = {
         'general': [ // Msg.admin_cat_general
             'cp-admin-flush-cache',
@@ -1166,7 +1152,7 @@ Messages.admin_channelPlaceholder = "Destroyed document placeholder";
         row(Messages.admin_blockArchived, localizeState(data.archived));
 
         row(Messages.admin_totpEnabled, localizeState(Boolean(data.totp.enabled)));
-        row(Messages.admin_totpRecoveryMethod, data.totp.recovery); // XXX localize?
+        row(Messages.admin_totpRecoveryMethod, data.totp.recovery);
 
         if (data.live) {
             var archiveButton = danger(Messages.ui_archive, function () {
@@ -1322,7 +1308,7 @@ Messages.admin_channelPlaceholder = "Destroyed document placeholder";
 
         row(Messages.admin_totpEnabled, localizeState(Boolean(data.totp.enabled)));
         if (data.totp && data.totp.enabled) {
-            row(Messages.admin_totpRecoveryMethod, data.totp.recovery); // XXX localize?
+            row(Messages.admin_totpRecoveryMethod, data.totp.recovery);
         }
 
         if (!data.totpCheck || !data.totp.enabled) { return tableObj.table; }
diff --git a/www/calendar/inner.js b/www/calendar/inner.js
index c0e923d63..ba46a4a7b 100644
--- a/www/calendar/inner.js
+++ b/www/calendar/inner.js
@@ -714,7 +714,6 @@ define([
                 }
             });
         }
-        Messages.calendar_settings = "Calendar Settings"; // XXX
         var dropdownConfig = {
             text: '',
             options: options, // Entries displayed in the menu
@@ -1195,9 +1194,6 @@ ICS ==> create a new event with the same UID and a RECURRENCE-ID field (with a v
         }).appendTo(APP.toolbar.$bottomL);
 
         // Change page
-        Messages.goLeft = "Left"; // XXX
-        Messages.goRight = "Right"; // XXX
-        Messages.date = "Date"; // XXX
         var goLeft = h('button.fa.fa-chevron-left',{'aria-label': Messages.goLeft});
         var goRight = h('button.fa.fa-chevron-right', {'aria-label': Messages.goRight});
         var goToday = h('button', Messages.calendar_today);
diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index 3b1f89d2a..84b5bb2c3 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -1550,30 +1550,6 @@ define([
 
     };
 
-    // XXX
-    Messages.dph_reason = "Reason: {0}";
-
-    Messages.dph_default = "This content is no longer available"; // default key when custom message not found
-
-    Messages.dph_account_destroyed = "This account has been deleted by its owner";
-    Messages.dph_account_inactive = "This account has been deleted for inactivity";
-    Messages.dph_account_moderated = "This account has been suspended by the moderation team";
-    Messages.dph_account_pw = "This account's password has been changed";
-
-    Messages.dph_pad_destroyed = "This document has been destroyed by its owner";
-    Messages.dph_pad_inactive = "This document has been deleted for inactivity";
-    Messages.dph_pad_moderated = "This document has been deleted by the moderation team";
-    Messages.dph_pad_moderated_account = "This document has been deleted with its owner's account"; // Keep this key ???
-    Messages.dph_pad_pw = "The document you are trying to open is protected with a new password. Enter the correct password to access the content.";
-
-    Messages.dph_tmp_destroyed = "This template has been destroyed by its owner";
-    Messages.dph_tmp_moderated = "This template has been deleted by the moderation team";
-    Messages.dph_tmp_moderated_account = "This template has been deleted with its owner's account"; // Keep this key ???
-    Messages.dph_tmp_pw = "This template is protected with a new password. Open it from your drive to enter its new password.";
-
-
-
-
     UI.getDestroyedPlaceholderMessage = (code, isAccount, isTemplate) => {
         var account = {
             ARCHIVE_OWNED: Messages.dph_account_destroyed,
@@ -1611,7 +1587,6 @@ define([
         var code = split[0]; // Generated code
         var input = split[1]; // User/admin manual input
         var text = UI.getDestroyedPlaceholderMessage(code, isAccount);
-        if (!text) { return; } // XXX
         var reasonBlock = input ? h('p', Messages._getKey('dph_reason', [input])) : undefined;
         return h('div', [
             h('p', text),
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 48af0783d..01e5d275b 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1742,8 +1742,6 @@ define([
         var termsLine = template(Messages.info_termsFlavour, Pages.termsLink);
         var sourceLine = template(Messages.info_sourceFlavour, Pages.sourceLink);
 
-    Messages.label_logo = "CryptPad logo"; // XXX Logo
-
         var content = h('div.cp-info-menu-container', [
                 h('div.logo-block', [
                     h('img', {
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 3aefbadca..88627ebfa 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -1516,7 +1516,6 @@ define([
                 $li = findDataHolder($tree.find('.cp-app-drive-element-active'));
             }
             var $button = $driveToolbar.find('#cp-app-drive-toolbar-context-mobile');
-            Messages.context_menu = 'Context menu'; // XXX
             $button.attr('aria-label', Messages.context_menu);
             if ($button.length) { // mobile
                 if ($li.length !== 1
@@ -2721,7 +2720,6 @@ define([
                 gridIcon,
                 listIcon
             ]));
-            Messages.label_viewMode = "Toggle view mode" // XXX
             $button.attr('aria-label', Messages.label_viewMode);
             var $gridIcon = $(gridIcon);
             var $listIcon = $(listIcon);
@@ -5402,7 +5400,6 @@ define([
             });
         }
         */
-        Messages.dph_sf_pw = "Your shared folder {0} is no longer available, it is now protected with a new password. You can remove this folder from your CryptDrive or recover access using the new password."; // XXX PLACEHOLDER
         APP.passwordModal = function (fId, data, cb) {
             var content = [];
 
diff --git a/www/common/notifications.js b/www/common/notifications.js
index b272e97cc..a9c3ee06f 100644
--- a/www/common/notifications.js
+++ b/www/common/notifications.js
@@ -415,9 +415,6 @@ define([
         var title = Util.fixHTML(msg.content.title);
         var teamName = Util.fixHTML(msg.content.teamName);
 
-        Messages.dph_sf_destroyed = "Your shared folder <em>{0}</em> has been destroyed by its owner."; // XXX
-        Messages.dph_sf_destroyed_team= "The shared folder <em>{0}</em> from your team <b>{1}</b> has been destroyed by its owner."; // XXX
-
         content.getFormatText = function() {
             if (teamName) {
                 return Messages._getKey('dph_sf_destroyed_team', [title, teamName]);
diff --git a/www/form/inner.js b/www/form/inner.js
index 67ec6edf4..624ce7d50 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -4254,8 +4254,6 @@ define([
         if (APP.responseDiv) { $(APP.responseDiv).detach(); }
         $container.empty().append(_content);
 
-
-// XXX Delete translation key form_updateMsg
         if (editable) {
             var responseMsg = h('div.cp-form-response-msg-container');
             var $responseMsg = $(responseMsg).appendTo($container);
diff --git a/www/teams/inner.js b/www/teams/inner.js
index eb010e305..80cad3bd6 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -544,7 +544,6 @@ define([
             if (state) { return; }
             var name = $(input).val();
             if (!name.trim()) { return; }
-            Messages.team_nameTooLong = "Team name is too long"; // XXX
             if(name.length > 50) { return UI.warn(Messages.team_nameTooLong); }
             state = true;
             $spinner.show();
@@ -1049,14 +1048,12 @@ define([
         var todo = function () {
             var newName = $input.val();
             if (!newName.trim()) { return; }
-            Messages.team_nameTooLong = "Team name is too long"; // XXX
             if(newName.length > 50){
                 return UI.warn(Messages.team_nameTooLong);
             }
             APP.module.execCommand('GET_TEAM_METADATA', {
                 teamId: APP.team
             }, function (obj) {
-                Messages.team_nameAlreadySet = "Team name is already set to {0}"; // XXX
                 if (obj && obj.error) { return void UI.warn(Messages.error); }
                 if (obj.name === newName) {
                     return void UI.warn(Messages._getKey('team_nameAlreadySet', [Util.fixHTML(newName)]));