diff --git a/lib/env.js b/lib/env.js
index 3d58f11f7..4db282d77 100644
--- a/lib/env.js
+++ b/lib/env.js
@@ -123,7 +123,7 @@ module.exports.create = function (config) {
 
         maxWorkers: config.maxWorkers,
         disableIntegratedTasks: config.disableIntegratedTasks || false,
-        disableIntegratedEviction: typeof(config.disableIntegratedEviction) === 'undefined'? true: config.disableIntegratedEviction, // XXX false,
+        disableIntegratedEviction: typeof(config.disableIntegratedEviction) === 'undefined'? true: config.disableIntegratedEviction, // XXX 4.10.0 false,
         lastEviction: +new Date(),
         evictionReport: {},
         commandTimers: {},
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 8b01ad652..eba151551 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -3034,9 +3034,18 @@ define([
         var name = Util.fixHTML(data.title);
         var url = data.href;
         var user = data.name;
-        Messages.notification_openLink = "You've received a link <b>{0}</b> from {1}:"; // XXX
-        Messages.link_open = "Open URL";
-        Messages.link_store = "Store link in drive";
+        //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.10.0
+
+        //Messages.link_store = "Store link in drive";
+            // toolbar_storeInDrive ? ("Store in CryptDrive")
+            // autostore_store ? ("Store")
+        Messages.link_store = Messages.toolbar_storeInDrive; // XXX 4.10.0
+
 
         var content = h('div', [
             UI.setHTML(h('p'), Messages._getKey('notification_openLink', [name, user])),
@@ -3069,7 +3078,6 @@ define([
             onClick: function () {
                 if (clicked) { return; }
                 clicked = true;
-                // XXX feedback
                 common.getSframeChannel().query("Q_DRIVE_USEROBJECT", {
                     cmd: "addLink",
                     data: {
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 21a2337a7..78618f7ed 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -1940,7 +1940,6 @@ define([
                 'class': 'cp-app-drive-element-ctime cp-app-drive-element-list'
             }).text(getDate(data.ctime));
             $element.append($type).append($adate).append($cdate);
-            // XXX feedback
         };
         var _addOwnership = function ($span, $state, data) {
             if (data && Array.isArray(data.owners) && data.owners.indexOf(edPublic) !== -1) {
@@ -2778,7 +2777,7 @@ define([
                     var u = $url.val().trim();
                     if (!n || !u) { return true; }
                     if (!Util.isValidURL(u)) {
-                        // XXX add style for invalid input? input:invalid
+                        // XXX 4.10.0 add style for invalid input? input:invalid
                         UI.warn(Messages.error);
                         return true;
                     }
diff --git a/www/common/inner/share.js b/www/common/inner/share.js
index 125dcb5e2..5225ea818 100644
--- a/www/common/inner/share.js
+++ b/www/common/inner/share.js
@@ -111,7 +111,6 @@ define([
                         if (mailbox) { // Friend
                             if (friends[curve] && !mailbox.notifications) { return; }
                             if (mailbox.notifications && mailbox.curvePublic) {
-                                // XXX feedback
                                 common.mailbox.sendTo("SHARE_PAD", {
                                     href: href,
                                     isStatic: Boolean(config.static),
diff --git a/www/common/notifications.js b/www/common/notifications.js
index 78c29b90f..83052ff68 100644
--- a/www/common/notifications.js
+++ b/www/common/notifications.js
@@ -92,7 +92,6 @@ define([
             (type === 'file' ? 'notification_fileShared' :  // Msg.notification_fileSharedTeam
                 'notification_padShared'); // Msg.notification_padSharedTeam
 
-        Messages.notification_linkShared = "{0} has shared a link with you: <b>{1}</b>"; // XXX
         if (msg.content.isStatic) {
             key = 'notification_linkShared'; // Msg.notification_linkShared;
         }
@@ -115,7 +114,6 @@ define([
         };
         content.handler = function() {
             if (msg.content.isStatic) {
-                // XXX feedback
                 UIElements.displayOpenLinkModal(common, {
                     curve: msg.author,
                     href: msg.content.href,
diff --git a/www/common/outer/cache-store.js b/www/common/outer/cache-store.js
index 514e18ab7..93bc0d0c6 100644
--- a/www/common/outer/cache-store.js
+++ b/www/common/outer/cache-store.js
@@ -97,7 +97,7 @@ define([
     var checkCheckpoints = function (array) {
         if (!Array.isArray(array)) { return; }
         // Keep the last 100 messages
-        if (array.length > 100) { // XXX
+        if (array.length > 100) { // XXX 4.10.0
             array.splice(0, array.length - 100);
         }
         // Remove every message before the first checkpoint
diff --git a/www/convert/inner.js b/www/convert/inner.js
index cdcf745ca..ba9870ccf 100644
--- a/www/convert/inner.js
+++ b/www/convert/inner.js
@@ -192,8 +192,8 @@ define([
         },
     };
 
-    Messages.convertPage = "Convert"; // XXX
-    Messages.convert_hint = "Pick the file you want to convert. The list of output format will be visible afterward."; // XXX
+    Messages.convertPage = "Convert"; // XXX 4.10.0
+    Messages.convert_hint = "Pick the file you want to convert. The list of output format will be visible afterward."; // XXX 4.10.0
 
     var createToolbar = function () {
         var displayed = ['useradmin', 'newpad', 'limit', 'pageTitle', 'notifications'];
diff --git a/www/form/inner.js b/www/form/inner.js
index 2a04eedd2..1b555be5d 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -1970,8 +1970,6 @@ define([
                 $(cbox).hide().find('input').attr('disabled', 'disabled').prop('checked', false);
             }
         } else {
-            Messages.form_anonName = "Your username"; // XXX
-            Messages.form_answerAs = "Answer as"; // XXX
             anonName = h('div.cp-form-anon-answer-input', [
                 Messages.form_answerAs,
                 h('input', {
diff --git a/www/form/main.js b/www/form/main.js
index b25a4b21a..de2c311ef 100644
--- a/www/form/main.js
+++ b/www/form/main.js
@@ -176,7 +176,7 @@ define([
                         validateKey: keys.secondaryValidateKey,
                         owners: [myKeys.edPublic],
                         crypto: crypto,
-                        //Cache: Utils.Cache // XXX
+                        //Cache: Utils.Cache // XXX 4.10.0
                     };
                     var results = {};
                     config.onError = function (info) {