diff --git a/customize.dist/pages/index.js b/customize.dist/pages/index.js
index e7038962f..816dbd49b 100644
--- a/customize.dist/pages/index.js
+++ b/customize.dist/pages/index.js
@@ -20,8 +20,6 @@ define([
         return AppConfig.availablePadTypes.indexOf(x) !== -1;
     };
 
-
-    // XXX PREMIUM
     var checkEarlyAccess = function (x) {
         // Check if this is an early access app and if they are allowed.
         // Check if this is a premium app and if you're premium
diff --git a/customize.dist/src/less2/include/contextmenu.less b/customize.dist/src/less2/include/contextmenu.less
index 2bd587e9e..08c7f1d9c 100644
--- a/customize.dist/src/less2/include/contextmenu.less
+++ b/customize.dist/src/less2/include/contextmenu.less
@@ -64,7 +64,6 @@
                     color: @cp_context-icon;
                     width: 16px;
                 }
-                // XXX PREMIUM
                 &.cp-app-disabled {
                     cursor: not-allowed !important;
                     opacity: 0.5;
diff --git a/customize.dist/src/less2/include/drive.less b/customize.dist/src/less2/include/drive.less
index 304816f49..c6a218653 100644
--- a/customize.dist/src/less2/include/drive.less
+++ b/customize.dist/src/less2/include/drive.less
@@ -81,7 +81,6 @@
                 }
             }
 
-            // XXX PREMIUM
             &.cp-app-hidden {
                 display: none !important;
             }
diff --git a/customize.dist/src/less2/include/dropdown.less b/customize.dist/src/less2/include/dropdown.less
index a7c810692..9ff9a75bf 100644
--- a/customize.dist/src/less2/include/dropdown.less
+++ b/customize.dist/src/less2/include/dropdown.less
@@ -121,7 +121,6 @@
                     color: @cp_dropdown-fg;
                 }
 
-                // XXX PREMIUM
                 &.cp-app-hidden {
                     display: none;
                 }
diff --git a/customize.dist/src/less2/include/icons.less b/customize.dist/src/less2/include/icons.less
index 4ea81ca71..474afe02c 100644
--- a/customize.dist/src/less2/include/icons.less
+++ b/customize.dist/src/less2/include/icons.less
@@ -39,7 +39,6 @@
             }
         }
 
-        // XXX PREMIUM
         &.cp-app-hidden {
             display: none !important;
         }
diff --git a/customize.dist/src/less2/pages/page-index.less b/customize.dist/src/less2/pages/page-index.less
index 41a3014c7..26ef0328d 100644
--- a/customize.dist/src/less2/pages/page-index.less
+++ b/customize.dist/src/less2/pages/page-index.less
@@ -124,7 +124,6 @@
         }
     }
     .cp-index-appitem {
-        // XXX PREMIUM
         &.cp-app-hidden {
             display: none;
         }
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 8bd4c07ea..5e05e23f4 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -2130,7 +2130,6 @@ define([
                 $modal.hide();
                 common.openURL('/' + p + '/');
             });
-            // XXX PREMIUM
             var premium = common.checkRestrictedApp(p);
             if (premium < 0) {
                 $element.addClass('cp-app-hidden cp-app-disabled');
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 170c43d76..2709e87d3 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -343,10 +343,7 @@ define([
             return arr;
         };
 
-    // delete fc_openInCode // XXX
     var createContextMenu = function (common) {
-        // XXX PREMIUM
-        // XXX "Edit in Document" and "New Document"  (and presentation)
         var getOpenIn = function (app) {
             var icon = AppConfig.applicationsIcon[app];
             var cls = icon.indexOf('cptools') === 0 ? 'cptools '+icon : 'fa '+icon;
@@ -1290,9 +1287,6 @@ define([
                         hide.push('openincode');
                         hide.push('preview');
                     }
-                    if ($element.is('.cp-border-color-sheet')) {
-                        //hide.push('download'); // XXX if we don't want to enable this feature yet
-                    }
                     if ($element.is('.cp-app-drive-static')) {
                         hide.push('access', 'hashtag', 'properties', 'download');
                     }
@@ -2914,7 +2908,6 @@ define([
                     'href': '#'
                 };
 
-                // XXX PREMIUM
                 var premium = common.checkRestrictedApp(type);
                 if (premium < 0) {
                     attributes.class += ' cp-app-hidden cp-app-disabled';
@@ -3249,7 +3242,6 @@ define([
                     .text(Messages.type[type]));
                 $element.attr('data-type', type);
 
-                // XXX PREMIUM
                 var premium = common.checkRestrictedApp(type);
                 if (premium < 0) {
                     $element.addClass('cp-app-hidden cp-app-disabled');
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index fed4e9e75..3139aa4f0 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -672,7 +672,6 @@ define([
                         additionalPriv.registeredOnly = true;
                     }
 
-                    // XXX PREMIUM
                     var priv = metaObj.priv;
                     var p = Utils.Util.checkRestrictedApp(parsed.type, AppConfig,
                               Utils.Constants.earlyAccessApps, priv.plan, additionalPriv.loggedIn);
diff --git a/www/common/sframe-common.js b/www/common/sframe-common.js
index c64c765b0..5ec215df5 100644
--- a/www/common/sframe-common.js
+++ b/www/common/sframe-common.js
@@ -915,7 +915,6 @@ define([
                     }, {forefront: true});
                     return;
                 }
-                // XXX PREMIUM
                 var blocked = privateData.premiumOnly && privateData.isNewFile;
                 if (blocked) {
                     var domain = ApiConfig.httpUnsafeOrigin || 'CryptPad';