diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 4f6e73ba0..d8f79d81e 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -2426,9 +2426,9 @@ define([
             case 'access':
                 button = $('<button>', {
                     'class': 'fa fa-unlock-alt cp-toolbar-icon-access',
-                    title: "ACCESS", // XXX
+                    title: Messages.accessButton,
                 }).append($('<span>', {'class': 'cp-toolbar-drawer-element'})
-                .text("ACCESS")) // XXX
+                .text(Messages.accessButton))
                 .click(common.prepareFeedback(type))
                 .click(function () {
                     common.isPadStored(function (err, data) {
@@ -3391,7 +3391,7 @@ define([
                 attributes: {
                     'class': 'cp-toolbar-menu-logout-everywhere fa fa-plug',
                 },
-                content: h('span', "CLOSE REMOTE SESSIONS") // XXX Messages.settings_logoutEverywhereTitle)
+                content: h('span', Messages.settings_logoutEverywhereTitle)
             });
             options.push({
                 tag: 'a',
@@ -4235,7 +4235,7 @@ define([
                 msg += Messages.errorCopy;
             }
         } else if (err.type === 'ERESTRICTED') {
-            msg = Messages.restrictedError || "RESTRICTED"; // XXX
+            msg = Messages.restrictedError;
         }
         var sframeChan = common.getSframeChannel();
         sframeChan.event('EV_SHARE_OPEN', {hidden: true});
diff --git a/www/common/inner/access.js b/www/common/inner/access.js
index 8bb90c5c5..9a6a619e7 100644
--- a/www/common/inner/access.js
+++ b/www/common/inner/access.js
@@ -11,10 +11,7 @@ define([
              Messages, nThen) {
     var Access = {};
 
-        // XXX contacts, teams, access_noContact
-        Messages.contacts = "Contacts"; // XXX
-        Messages.teams = "Teams"; // XXX
-        Messages.access_noContact = "No other contact to add"; // XXX
+
 
     var evRedrawAll = Util.mkEvent();
 
@@ -120,7 +117,7 @@ define([
                 if (teamOwner && teams[teamOwner] && teams[teamOwner].edPublic === ed) { me = true; }
                 if (ed === edPublic && !teamOwner) { me = true; }
                 nThen(function (waitFor) {
-                    var msg = me ? Messages.owner_removeMeConfirm : Messages.owner_removeConfirm; // XXX check existing keys
+                    var msg = me ? Messages.owner_removeMeConfirm : Messages.owner_removeConfirm;
                     UI.confirm(msg, waitFor(function (yes) {
                         if (!yes) {
                             waitFor.abort();
@@ -438,12 +435,6 @@ define([
                 }
             });
 
-            // XXX allow_removeConfirm, allow_checkbox, allow_text, allow_addConfirm
-            Messages.allow_addConfirm = "Are you sure?"; // XXX
-            Messages.allow_removeConfirm = "Are you sure?"; // XXX
-            Messages.allow_checkbox = "Enable allow list"; // XXX
-            Messages.allow_text = 'Pewpewpew'; // XXX
-
             var remove = function (el) {
                 // Check selection
                 var $el = $(el);
@@ -701,7 +692,7 @@ define([
             }
             // Otherwise it's a stranger
             _owners[ed] = {
-                name: '???', // XXX unkwown?
+                name: Messages.owner_unknownUser,
             };
             strangers++;
         });
@@ -884,11 +875,6 @@ define([
             return $d;
         };
         var drawRight = function () {
-            // XXX allow_enabled, allow_disabled, allow_label
-            Messages.allow_enabled = 'ENABLED'; // XXX
-            Messages.allow_disabled = 'DISABLED'; // XXX
-            Messages.allow_label = 'Allow list: {0}'; // XXX
-
             // Owners
             var content = [];
             var _ownersGrid = getUserList(common, data.owners);
@@ -939,9 +925,6 @@ define([
                 });
             }
 
-            // XXX access_muteRequests
-            Messages.access_muteRequests = "Mute access requests for this pad"; // XXX
-
             // Mute access requests
             var priv = common.getMetadataMgr().getPrivateData();
             var edPublic = priv.edPublic;
@@ -1105,10 +1088,6 @@ define([
                 });
             }));
         }).nThen(function () {
-            // XXX access_main, access_allow
-            Messages.access_main = 'ACCESS'; // XXX
-            Messages.access_allow = 'ALLOW'; // XXX
-
             var tabs = UI.dialog.tabs([{
                 title: Messages.access_main,
                 icon: "fa fa-unlock-alt",
diff --git a/www/common/sframe-common-file.js b/www/common/sframe-common-file.js
index 1398e960b..bca4fe233 100644
--- a/www/common/sframe-common-file.js
+++ b/www/common/sframe-common-file.js
@@ -164,9 +164,6 @@ define([
                 queue.next();
                 if (e === 'TOO_LARGE') {
                     $pv.text(Messages.upload_tooLargeBrief);
-                    // XXX translate
-                    // instead of "This file exceeds the maximum upload size"
-                    // use "the maximum upload size allowed for your account"
                     return void UI.alert(Messages.upload_tooLarge);
                 }
                 if (e === 'NOT_ENOUGH_SPACE') {