diff --git a/www/admin/inner.js b/www/admin/inner.js
index 1063cec9d..229084809 100644
--- a/www/admin/inner.js
+++ b/www/admin/inner.js
@@ -941,32 +941,6 @@ define([
         return;
     };
 
-    Messages.admin_cat_broadcast = "Broadcast"; // XXX
-
-    Messages.admin_maintenanceTitle = "Maintenance"; // XXX
-    Messages.admin_maintenanceHint = "Plan, remove or update a maintenance. You can only have one active maintenance at a time."; // XXX
-    Messages.admin_maintenanceButton = "Plan maintenance"; // XXX
-    Messages.admin_maintenanceCancel = "Cancel planned maintenance"; // XXX
-    Messages.broadcast_start = 'Start time';
-    Messages.broadcast_end = 'End time';
-
-
-    Messages.admin_surveyTitle = "Survey"; // XXX
-    Messages.admin_surveyHint = "Add, update or remove the active survey accessible from the user menu"; // XXX
-    Messages.admin_surveyButton = "Apply survey"; // XXX
-    Messages.admin_surveyCancel = "Cancel active survey"; // XXX
-    Messages.admin_surveyActive = "View the active survey"; // XXX
-    Messages.broadcast_surveyURL = 'Survey URL';
-
-    Messages.admin_broadcastTitle = "Broadcast a message"; // XXX
-    Messages.admin_broadcastHint = "Send a message to all the existing and future users as a notification"; // XXX
-    Messages.admin_broadcastButton = "Send"; // XXX
-    Messages.admin_broadcastActive = "Active message"; // XXX
-    Messages.admin_broadcastCancel = "Delete active message"; // XXX
-    Messages.broadcast_translations = 'Translations';
-    Messages.broadcast_defaultLanguage = 'Fallback to this language';
-    Messages.broadcast_preview = "Preview in a fake notification";
-
     var getApi = function (cb) {
         return function () {
             require(['/api/broadcast?'+ (+new Date())], function (Broadcast) {
@@ -1321,8 +1295,7 @@ define([
             var end = h('input');
             var $start = $(start);
             var $end = $(end);
-            // XXX new Date().toLocaleString('fr-fr', {month: 'long'}).replace(/./, c => c.toUpperCase())
-            var endPickr = Flatpickr(end, { // XXX translations?
+            var endPickr = Flatpickr(end, {
                 enableTime: true,
                 minDate: new Date()
             });
diff --git a/www/common/application_config_internal.js b/www/common/application_config_internal.js
index 075050fa8..20c1cd8b7 100644
--- a/www/common/application_config_internal.js
+++ b/www/common/application_config_internal.js
@@ -43,7 +43,7 @@ define(function() {
     /* You can display a link to your own privacy policy in the static pages footer.
      * To do so, set the following value to the absolute URL of your privacy policy.
      */
-    //config.privacy = '/privacy.html'; // XXX
+    //config.privacy = '/privacy.html';
     // config.privacy = 'https://xwiki.com/en/company/PrivacyPolicy';
 
     /*  Cryptpad apps use a common API to display notifications to users
diff --git a/www/common/notifications.js b/www/common/notifications.js
index 54748defc..34c00b092 100644
--- a/www/common/notifications.js
+++ b/www/common/notifications.js
@@ -410,7 +410,6 @@ define([
         }
     };
 
-    Messages.broadcast_newSurvey = "A new survey is available."; // XXX
     handlers['BROADCAST_SURVEY'] = function (common, data) {
         var content = data.content;
         var msg = content.msg.content;
@@ -426,7 +425,6 @@ define([
         }
     };
 
-    Messages.broadcast_newCustom = "Message from the administrators"; // XXX
     handlers['BROADCAST_CUSTOM'] = function (common, data) {
         var content = data.content;
         var msg = content.msg.content;
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 4481f64f1..acdcbd441 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -1037,10 +1037,9 @@ MessengerUI, Messages, Pages) {
         return $userAdmin;
     };
 
-    Messages.broadcast_maintenance = "A maintenance is planned between <b>{0}</b> and <b>{1}</b>"; // XXX
     var createMaintenance = function (toolbar, config) {
         var $notif = toolbar.$top.find('.'+MAINTENANCE_CLS);
-        var button = h('button.cp-maintenance-wrench.fa.fa-wrench'); // XXX might need some color contrast
+        var button = h('button.cp-maintenance-wrench.fa.fa-wrench');
         $notif.append(button);
 
 
diff --git a/www/settings/inner.js b/www/settings/inner.js
index 5404d399c..d3ad39986 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -469,10 +469,6 @@ define([
         });
     }, true);
 
-    Messages.settings_deleteWarning = "Warning: it seems you're subscribed to a premium plan (paid or given by another user). Please cancel paid subscriptions before deleting your account as you won't be able to do it yourself once the account is deleted."; // XXX
-    Messages.settings_deleteContinue = "Delete my account"; // XXX
-    Messages.settings_deleteSubscription = "Manage my subscription"; // XXX
-
     makeBlock('delete', function(cb) { // Msg.settings_deleteHint, .settings_deleteTitle
         if (!common.isLoggedIn()) { return cb(false); }