diff --git a/www/form/inner.js b/www/form/inner.js
index 5613ddf43..1b801707b 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -1589,7 +1589,6 @@ define([
                 ];
                 $(pollHint).find('i').each(function (index) {
                     this.setAttribute('class', classes[index]);
-                    // XXX accessibility options?
                 });
 
                 var tag = h('div.cp-form-type-poll-container', [
diff --git a/www/support/ui.js b/www/support/ui.js
index bae96c24e..679776c59 100644
--- a/www/support/ui.js
+++ b/www/support/ui.js
@@ -133,7 +133,7 @@ define([
             'account', // Msg.support_cat_account
             'data', // Msg.support_cat_data
             'bug', // Msg.support_cat_bug
-            // XXX report
+            // TODO report
             'other' // Msg.support_cat_other
         ];
         if (all) { categories.push('all'); } // Msg.support_cat_all
@@ -178,7 +178,7 @@ define([
         var catContainer = h('div.cp-dropdown-container' + (title ? '.cp-hidden': ''));
         makeCategoryDropdown(ctx, catContainer, function (key) {
             $(category).val(key);
-            // XXX add a hint suggesting relevant information to include for the chosen category
+            // TODO add a hint suggesting relevant information to include for the chosen category
         });
 
         var attachments, addAttachment;