diff --git a/www/calendar/inner.js b/www/calendar/inner.js
index a1fd8c8e8..fbc910bdb 100644
--- a/www/calendar/inner.js
+++ b/www/calendar/inner.js
@@ -566,7 +566,7 @@ define([
                 attributes: {
                     'class': 'fa fa-trash-o',
                 },
-                content: h('span', Messages.kanban_delete), // XXX delete key is misleading... "Remove" ? `poll_remove`, `fc_remove`
+                content: h('span', Messages.poll_remove),
                 action: function (e) {
                     e.stopPropagation();
                     var cal = APP.calendars[id];
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 05b27f055..d9d6324cd 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -158,7 +158,7 @@ define([
             var data = users[key];
             var name = UI.getDisplayName(data.displayName || data.name);
             var avatar = h('span.cp-usergrid-avatar.cp-avatar', {
-                'aria-hidden': true, // XXX aria
+                'aria-hidden': true,
             });
             common.displayAvatar($(avatar), data.avatar, name, Util.noop, data.uid);
             var removeBtn, el;
@@ -1658,7 +1658,6 @@ define([
         UI.openCustomModal(modal);
     };
 
-    Messages.toolbar_userMenuAlt = "User menu"; // XXX
     UIElements.createUserAdminMenu = function (Common, config) {
         var metadataMgr = Common.getMetadataMgr();
 
@@ -1991,9 +1990,6 @@ define([
         */
 
         var $displayName = $userAdmin.find('.'+displayNameCls);
-        $userAdmin.attr({ // XXX is this on the right element?
-            alt: Messages.toolbar_userMenuAlt,
-        });
 
         var $avatar = $userAdmin.find('> button .cp-dropdown-button-title');
         var loadingAvatar;
@@ -2031,8 +2027,6 @@ define([
                     $userAdmin.find('> button').removeClass('cp-avatar');
                     if ($img) { $userAdmin.find('> button').addClass('cp-avatar'); }
                     loadingAvatar = false;
-
-                    // XXX alt="User menu"
                 }, uid);
                 return;
             }
@@ -3049,18 +3043,6 @@ define([
         var name = Util.fixHTML(data.title);
         var url = data.href;
         var user = data.name;
-        //Messages.link_open = "Open URL";
-            // openLinkInNewTab ("Open Link in New Tab")
-            // fc_open ("Open")
-            // share_linkOpen ("Preview")
-            // resources_openInNewTab ("Open it in a new tab")
-        Messages.link_open = Messages.fc_open; // XXX 4.11.0
-
-        //Messages.link_store = "Store link in drive";
-            // toolbar_storeInDrive ? ("Store in CryptDrive")
-            // autostore_store ? ("Store")
-        Messages.link_store = Messages.toolbar_storeInDrive; // XXX 4.11.0
-
 
         var content = h('div', [
             UI.setHTML(h('p'), Messages._getKey('notification_openLink', [name, user])),
@@ -3079,7 +3061,7 @@ define([
             keys: [27]
         }, {
             className: 'primary',
-            name: Messages.link_open,
+            name: Messages.fc_open,
             onClick: function () {
                 if (clicked) { return true; }
                 clicked = true;
@@ -3089,7 +3071,7 @@ define([
             keys: [13]
         }, {
             className: 'primary',
-            name: Messages.link_store,
+            name: Messages.toolbar_storeInDrive,
             onClick: function () {
                 if (clicked) { return; }
                 clicked = true;
diff --git a/www/common/sframe-common-file.js b/www/common/sframe-common-file.js
index a56313444..facd27f22 100644
--- a/www/common/sframe-common-file.js
+++ b/www/common/sframe-common-file.js
@@ -315,9 +315,6 @@ define([
             return manualStore;
         };
 
-        Messages.upload_modal_alt = "Alt text"; // XXX
-        Messages.upload_addOptionalAlt = "Add descriptive text (optional)"; // XXX
-
         var fileUploadModal = function (defaultFileName, cb, preview) {
             var parsedName = /^(\.?.+?)(\.[^.]+)?$/.exec(defaultFileName) || [];
             var ext = parsedName[2] || "";
@@ -332,10 +329,9 @@ define([
                                    Messages._getKey('upload_modal_filename', [ext])),
                 h('input#cp-upload-name', {type: 'text', placeholder: defaultFileName, value: defaultFileName}),
 
-                h('label', {for: 'cp-upload-alt'}, Messages.upload_addOptionalAlt), // XXX alt text for uploads
+                h('label', {for: 'cp-upload-alt'}, Messages.upload_addOptionalAlt),
                 h('input#cp-upload-alt', {type: 'text', placeholder: Messages.upload_modal_alt}),
 
-
                 h('label', {for: 'cp-upload-password'}, Messages.addOptionalPassword),
                 UI.passwordInput({id: 'cp-upload-password'}),
                 h('span', {
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 62aa5dc32..c61387f6e 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -164,7 +164,6 @@ MessengerUI, Messages, Pages) {
         });
     };
     var showColors = false;
-    Messages.userlist_visitProfile = "Visit {0}'s profile"; // XXX "'s" is incorrect for names that end in "s" in English... don't care?
     var updateUserList = function (toolbar, config, forceOffline) {
         if (!config.displayed || config.displayed.indexOf('userlist') === -1) { return; }
         if (toolbar.isAlone) { return; }
@@ -459,8 +458,6 @@ MessengerUI, Messages, Pages) {
         return $container;
     };
 
-    Messages.toolbar_collapse = "Collapse toolbar"; // XXX 4.11.0
-    Messages.toolbar_expand = "Expand toolbar"; // XXX 4.11.0
     createCollapse = function (toolbar) {
         var up = h('i.fa.fa-chevron-up', {title: Messages.toolbar_collapse});
         var down = h('i.fa.fa-chevron-down', {title: Messages.toolbar_expand});
@@ -1046,7 +1043,10 @@ MessengerUI, Messages, Pages) {
             userMenuCfg.displayChangeName = 1;
         }
         Common.createUserAdminMenu(userMenuCfg);
-        $userAdmin.find('> button').attr('title', Messages.userAccountButton);
+        $userAdmin.find('> button').attr({
+            title: Messages.userAccountButton,
+            alt: Messages.userAccountButton,
+        });
 
         return $userAdmin;
     };
diff --git a/www/profile/inner.js b/www/profile/inner.js
index edf5ce01e..0b720940b 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -341,8 +341,6 @@ define([
         });
     };
 
-    Messages.profile_defaultAlt = "Default profile picture"; // XXX
-
     var displayAvatar = function (val) {
         var sframeChan = common.getSframeChannel();
         var $span = APP.$avatar;
@@ -350,7 +348,7 @@ define([
         if (!val) {
             $('<img>', {
                 src: '/customize/images/avatar.png',
-                title: Messages.profile_avatar,
+                title: Messages.profile_avatar, // XXX
                 alt: Messages.profile_defaultAlt,
             }).appendTo($span);
             return;
diff --git a/www/teams/inner.js b/www/teams/inner.js
index bd7fca5ed..485923996 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -1099,7 +1099,7 @@ define([
             if (!val) {
                 var $img = $('<img>', {
                     src: '/customize/images/avatar.png',
-                    title: Messages.profile_avatar,
+                    title: Messages.profile_avatar, // XXX
                     alt: 'Avatar'
                 });
                 var mt = h('media-tag', $img[0]);