diff --git a/www/code/inner.js b/www/code/inner.js
index 56b83b49b..00b6ee50a 100644
--- a/www/code/inner.js
+++ b/www/code/inner.js
@@ -78,7 +78,6 @@ define([
     ]);
 
     var mkThemeButton = function (framework) {
-        Messages.toolbar_theme = "Theme"; // XXX (duplicate from slide/inner.js)
         var $theme = $(h('button.cp-toolbar-appmenu', [
             h('i.cptools.cptools-palette'),
             h('span.cp-button-name', Messages.toolbar_theme)
@@ -121,7 +120,7 @@ define([
             name: 'authormarks',
             icon: 'fa-paint-brush',
         }).hide();
-        framework._.toolbar.$theme.append($showAuthorColorsButton); // XXX
+        framework._.toolbar.$theme.append($showAuthorColorsButton);
         markers.setButton($showAuthorColorsButton);
     };
     var mkPrintButton = function (framework, $content, $print) {
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 200f4f458..5d9f38077 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1510,7 +1510,7 @@ define([
                 break;
             case 'present':
                 button = $(h('button', {
-                    title: Messages.presentButtonTitle, // XXX remove tippy?
+                    //title: Messages.presentButtonTitle, // TODO display if the label text is collapsed
                 }, [
                     h('i.fa.fa-play-circle'),
                     h('span.cp-toolbar-name', Messages.share_linkPresent)
@@ -1518,7 +1518,7 @@ define([
                 break;
             case 'preview':
                 button = $(h('button', {
-                    title: Messages.previewButtonTitle, // XXX remove tippy?
+                    //title: Messages.previewButtonTitle, // TODO display if the label text is collapsed
                 }, [
                     h('i.fa.fa-eye'),
                     h('span.cp-toolbar-name', Messages.share_linkOpen)
@@ -1555,16 +1555,14 @@ define([
                 }
                 break;
             case 'mediatag':
-                Messages.toolbar_insert = "Insert"; // XXX
                 button = $(h('button.cp-toolbar-mediatag', {
-                    title: Messages.filePickerButton, // XXX remove tippy?
+                    //title: Messages.filePickerButton, // TODO display if the label text is collapsed
                 }, [
                     h('i.fa.fa-picture-o'),
                     h('span.cp-toolbar-name', Messages.toolbar_insert)
                 ])).click(common.prepareFeedback(type));
                 break;
             case 'savetodrive':
-                Messages.toolbar_savetodrive = "Save as image"; // XXX
                 button = $(h('button.cp-toolbar-savetodrive', {
                     title: Messages.canvas_saveToDrive,
                 }, [
@@ -1588,9 +1586,8 @@ define([
                 });
                 break;
             case 'toggle':
-                Messages.toolbar_tools = "Tools"; // XXX
                 button = $(h('button.cp-toolbar-tools', {
-                    title: data.title || '', // XXX remove tippy?
+                    //title: data.title || '', // TODO display if the label text is collapsed
                 }, [
                     h('i.fa.fa-wrench'),
                     h('span.cp-toolbar-name', Messages.toolbar_tools)
@@ -1661,7 +1658,7 @@ define([
                 var drawerCls = data.drawer === false ? '' : '.cp-toolbar-drawer-element';
                 var icon = data.icon || "fa-question";
                 button = $(h('button', {
-                    title: data.title || '', // XXX remove tippy?
+                    //title: data.title || '',
                 }, [
                     h('i.fa.' + icon),
                     h('span.cp-toolbar-name'+drawerCls, data.text)
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 0b5a5c009..e637d7410 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -3004,7 +3004,6 @@ define([
             }
         };
         var collapseTreeButton = function () {
-            Messages.drive_treeButton = "Files"; // XXX
             APP.$collapseButton = APP.$collapseButton || common.createButton('', true, {
                 text: Messages.drive_treeButton,
                 name: 'files',
diff --git a/www/common/migrate-user-object.js b/www/common/migrate-user-object.js
index 15b790531..18bc9c61b 100644
--- a/www/common/migrate-user-object.js
+++ b/www/common/migrate-user-object.js
@@ -329,7 +329,7 @@ define([
                 if (!h) { return; }
                 var next = waitFor(function () {
                     Feedback.send('Migrate-10', true);
-                    userObject.version = version = 10; // XXX
+                    userObject.version = version = 10;
                 });
                 var old;
                 var opts = {
diff --git a/www/common/notifications.js b/www/common/notifications.js
index 127c0621a..3abc40ca8 100644
--- a/www/common/notifications.js
+++ b/www/common/notifications.js
@@ -365,7 +365,6 @@ define([
         }
     };
 
-    Messages.todo_move = "Your todo list has been moved to the pad <b>{0}</b>, as the Todo app is now deprecated."; // XXX
     handlers['MOVE_TODO'] = function(common, data) {
         var content = data.content;
         var msg = content.msg;
diff --git a/www/common/sframe-common-codemirror.js b/www/common/sframe-common-codemirror.js
index 9efd30bce..13655a333 100644
--- a/www/common/sframe-common-codemirror.js
+++ b/www/common/sframe-common-codemirror.js
@@ -359,7 +359,6 @@ define([
                         content: l.name // Pretty name of the language value
                     });
                 });
-                Messages.code_editorTheme = "Editor theme"; // XXX
                 var dropdownConfig = {
                     text: Messages.code_editorTheme, // Button initial text
                     options: options, // Entries displayed in the menu
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index dcdb8b03a..a151e95f6 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -90,7 +90,6 @@ MessengerUI, Messages) {
 
         var $file = $toolbar.find('.'+BOTTOM_LEFT_CLS);
 
-        Messages.toolbar_file = "File"; // XXX
         if (!config.hideDrawer) {
             // XXX a lot of this logic is duplicated (code, slide, here)
             var $drawer = $(h('button.' + FILE_CLS, [
diff --git a/www/slide/inner.js b/www/slide/inner.js
index d0c87e940..f09fd3628 100644
--- a/www/slide/inner.js
+++ b/www/slide/inner.js
@@ -102,7 +102,6 @@ define([
 
     // XXX this function is a duplicate of /code/
     var mkThemeButton = function (framework) {
-        Messages.toolbar_theme = "Theme"; // XXX
         var $theme = $(h('button.cp-toolbar-appmenu', [
             h('i.cptools.cptools-palette'),
             h('span.cp-button-name', Messages.toolbar_theme)
@@ -378,7 +377,6 @@ define([
             framework.localChange();
         };
 
-        Messages.slide_backCol = "Background color"; // XXX
         var $back = framework._.sfCommon.createButton(null, true, {
             icon: 'fa-square',
             text: Messages.slide_backCol,
@@ -387,7 +385,6 @@ define([
             name: 'background',
             id: SLIDE_BACKCOLOR_ID
         });
-        Messages.slide_textCol = "Text color"; // XXX
         var $text = framework._.sfCommon.createButton(null, true, {
             icon: 'fa-i-cursor',
             text: Messages.slide_textCol,
diff --git a/www/whiteboard/inner.js b/www/whiteboard/inner.js
index c0d0e2fe7..18fad97f6 100644
--- a/www/whiteboard/inner.js
+++ b/www/whiteboard/inner.js
@@ -394,7 +394,6 @@ define([
                 });
             }).appendTo($drawer);
         } else {
-            Messages.toolbar_insert = "Insert"; // XXX duplicate key from common-ui-elements
             framework._.sfCommon.createButton('', true, {
                 title: Messages.canvas_imageEmbed,
                 text: Messages.toolbar_insert,