diff --git a/customize.dist/messages.js b/customize.dist/messages.js
index 9d8b97a10..471f68c2d 100755
--- a/customize.dist/messages.js
+++ b/customize.dist/messages.js
@@ -105,8 +105,6 @@ define(req, function(AppConfig, Default, Language) {
         extend(messages, Language);
     }
 
-    messages.type.diagram = "Diagram";  // XXX
-
     messages._languages = map;
     messages._languageUsed = language;
 
diff --git a/customize.dist/pages/recovery.js b/customize.dist/pages/recovery.js
index 33c19f61f..1001a1026 100644
--- a/customize.dist/pages/recovery.js
+++ b/customize.dist/pages/recovery.js
@@ -7,20 +7,6 @@ define([
     '/customize/pages.js'
 ], function (Config, $, h, UI, Msg, Pages) {
 
-Msg.recovery_header = "Account recovery"; // XXX
-Msg.recovery_mfa_description = "If you have lost access to your Two-Factor Authentication method you can disable 2FA for your account using your recovery code. Please start by entering your login and password:";
-Msg.recovery_mfa_secret = "Please enter your recovery code to disable 2FA for your account:";
-Msg.recovery_mfa_secret_ph = "Recovery code";
-
-Msg.mfa_disable = "Disable 2FA"; // XXX also in settings
-Msg.continue = "Continue"; // XXX also in settings
-
-Msg.recovery_forgot = 'Forgot recovery code';
-Msg.recovery_forgot_text = 'Please copy the following information and <a href="mailto:{0}">email it</a> to your instance administrators';
-
-Msg.recovery_mfa_error = "Unknown error. Please reload and try again.";
-Msg.recovery_mfa_disabled = "Multi-factor authentication is already disabled for this account.";
-
     return function () {
         document.title = Msg.recovery_header;
 
diff --git a/www/admin/inner.js b/www/admin/inner.js
index d4c5ea470..e234476cf 100644
--- a/www/admin/inner.js
+++ b/www/admin/inner.js
@@ -1235,13 +1235,6 @@ define([
         return $div;
     };
 
-    Messages.admin_totpEnabled = "TOTP is enabled"; // XXX
-    Messages.admin_totpRecoveryMethod = "TOTP recovery method"; // XXX
-    Messages.admin_totpFailed = "Signature verification failed";
-    Messages.admin_totpCheck = "Signature verification success";
-    Messages.admin_totpDisable = "Disable TOTP for this account";
-    Messages.admin_totpDisableButton = "Disable";
-
     var renderTOTPData  = function (data) {
         var tableObj = makeMetadataTable('cp-block-stats');
         var row = tableObj.row;
@@ -1311,7 +1304,7 @@ define([
         var results = h('span');
         $div.append(results);
         var $btn = $div.find('.btn');
-        $btn.text(Messages.ui_generateReport);
+        $btn.text(Messages.admin_totpDisable);
         disable($btn);
 
         var pending = false;
diff --git a/www/settings/inner.js b/www/settings/inner.js
index f706595f4..5b3325aea 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -49,37 +49,6 @@ define([
     var privateData;
     var sframeChan;
 
-    // XXX EXISTING KEYS TO CHANGE
-    Messages.settings_cat_security = "Security & Privacy";
-    Messages.login_noSuchUser = "Invalid username or password";
-
-    // NEW KEYS
-    Messages.settings_mfaTitle = "Two-Factor Authentication (2FA)"; // XXX
-    Messages.settings_mfaHint = "Protect your account with an additional verification code provided by an authenticator app of your choice "; // XXX
-    // Messages.settings_cat_access = "Security"; // XXX
-    Messages.done = "Done";
-    Messages.continue = "Continue";
-    Messages.mfa_setup_label = "To enable 2FA, please begin by entering your account password"; // XXX
-    Messages.mfa_setup_button = "Begin 2FA setup"; // XXX
-    Messages.mfa_revoke_label = "To disable 2FA, please begin by entering your account password"; // XXX
-    Messages.mfa_revoke_button = "Confirm disable 2FA"; // XXX
-    Messages.mfa_revoke_code = "Please enter your verification code";
-    Messages.mfa_status_on = "2FA is active on this account";
-    Messages.mfa_status_off = "2FA is not active on this account";
-    Messages.mfa_recovery_title = "Save this recovery code now";
-    Messages.mfa_recovery_hint = "If you loose access to your authenticator app you may be locked out of your CryptPad account. This recovery code can be used to disable 2FA and let you back in. ";
-    Messages.mfa_recovery_warning = "This code will not be shown again, please save it in a safe space now and do not share it with anyone.";
-    Messages.mfa_enable = "Enable 2FA";
-    Messages.mfa_disable = "Disable 2FA";
-
-    Messages.settings_otp_code = "Verification code"; // XXX
-    Messages.settings_otp_invalid = "Invalid OTP code"; // XXX
-    Messages.settings_otp_tuto = "Please scan this QR code with your authenticator app and paste the verification code to confirm.";
-
-    Messages.settings_removeOwnedTitle = "Destroy all owned documents"; // XXX
-    Messages.settings_removeOwnedButton = "Destroy documents";
-    Messages.settings_removeOwnedText = "Please wait while your document are being destroyed...";
-    Messages.settings_removeOwnedHint = "All documents where you are the sole owner will be permanently destroyed"
 
     var categories = {
         'account': [ // Msg.settings_cat_account