diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 2be4dcf82..9a26505d6 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -366,8 +366,6 @@ define([
                     input: { value: 'MEMBER' },
                 });
 
-Messages.team_inviteRole = "Initial role"; // XXX
-Messages.team_inviteUses = "Use(s) allowed for this link (0 = no limit)"; // XXX
 
         var linkContent = h('div.cp-share-modal', [
             h('p', Messages.team_inviteLinkTitle ),
@@ -427,7 +425,7 @@ Messages.team_inviteUses = "Use(s) allowed for this link (0 = no limit)"; // XXX
             }, h('textarea', {
                 readonly: 'readonly'
             })),
-            linkWarning = h('div.cp-teams-invite-alert.alert.alert-warning.dismissable', { // XXX remove warning?
+            linkWarning = h('div.cp-teams-invite-alert.alert.alert-warning.dismissable', {
                 style: "display: none;"
             }, [
                 h('span.cp-inline-alert-text', Messages.team_inviteLinkWarning),
diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index 8fb96b097..cc7071075 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -1609,7 +1609,7 @@ define([
         var ephemeralKeys = Invite.generateKeys();
 
         // Initial role of the invited users
-        var role = data.role || "VIEWER"; // XXX
+        var role = data.role || "VIEWER";
         var uses = data.uses || 1;
 
         nThen(function (w) {
diff --git a/www/convert/inner.js b/www/convert/inner.js
index 062d37592..4db50209c 100644
--- a/www/convert/inner.js
+++ b/www/convert/inner.js
@@ -293,7 +293,7 @@ define([
     };
 
     Messages.convertPage = "Convert"; // XXX 4.11.0
-    Messages.convert_hint = "Pick the file you want to convert. The list of output format will be visible afterward."; // XXX 4.11.0
+    Messages.convert_hint = "Pick the file you want to convert. The list of output format will be visible afterwards."; // XXX 4.11.0
 
     var createToolbar = function () {
         var displayed = ['useradmin', 'newpad', 'limit', 'pageTitle', 'notifications'];
diff --git a/www/form/inner.js b/www/form/inner.js
index 790449786..53ee06d09 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -4305,7 +4305,6 @@ define([
             };
             refreshPublic();
 
-            Messages.form_anonymized = "Responses are anonymized"; // XXX
 
             // Make answers anonymous
             var anonContainer = h('div.cp-form-anon-container');