diff --git a/templates/2k11/admin/category.inc.tpl b/templates/2k11/admin/category.inc.tpl
index 2359a9a3..63b14897 100644
--- a/templates/2k11/admin/category.inc.tpl
+++ b/templates/2k11/admin/category.inc.tpl
@@ -94,8 +94,6 @@
             <div class="clearfix even">
                 <div class="form_field">
                     <label for="category_icon">{$CONST.CATEGORY} {$CONST.IMAGE}</label>
-                    {* TODO: this should probably become/fallback to input[type=file]; also needs
-                             a no-js fallback since this is unusable without JS as of now *}
                     <input id="category_icon" name="serendipity[cat][icon]" type="text" value="{$this_cat.category_icon|default:""|escape:"html"}">
                 </div>
 
diff --git a/templates/2k11/admin/installer.inc.tpl b/templates/2k11/admin/installer.inc.tpl
index 7c34269c..01a5af8c 100644
--- a/templates/2k11/admin/installer.inc.tpl
+++ b/templates/2k11/admin/installer.inc.tpl
@@ -45,7 +45,6 @@
                     <caption>{$CONST.PHP_INSTALLATION}</caption>
                     <thead>
                         <tr>
-                            {* TODO: These are probably poorly labelled, needs to be checked *}
                             <th>Key</th> {* i18n *}
                             <th>Value</th> {* i18n *}
                         </tr>
diff --git a/templates/2k11/admin/plugin_config_item.tpl b/templates/2k11/admin/plugin_config_item.tpl
index 77d8b3e9..7ba02d0e 100644
--- a/templates/2k11/admin/plugin_config_item.tpl
+++ b/templates/2k11/admin/plugin_config_item.tpl
@@ -30,7 +30,6 @@
 {elseif $ctype == 'string'}
     <div class="clearfix form_field">
         <label for="serendipity_{$config_item}">{$cname}{if $cdesc != ''} <a class="toggle_info" href="#{$config_item}_info"><span class="icon-info-circled"></span><span class="visuallyhidden"> More</span></a>{/if}</label>
-        {* TODO: Make sure id creation actually produces unique identifiers *}
         <input id="serendipity_{$config_item}" class="direction_{$lang_direction}" name="serendipity[{$postKey}][{$config_item}]" type="{$input_type}" value="{$hvalue}">
         {if $cdesc != ''}<span id="{$config_item}_info" class="field_info additional_info">{$cdesc}</span>{/if}
     </div>
@@ -85,7 +84,7 @@
             {if $checkable}
                 <div class="form_check">
                     <input id="activate_{$orid['id']}" name="serendipity[{$postKey}][activate][{$config_item}][{$orid['id']}]" {(in_array($orid['id'], $store_order)) ? ' checked="checked" ' : ''} type="checkbox" onclick="sort_{$config_item}_Sequence();" value="true">
-                    {* TODO: needs label *}
+                    <label for="activate_{$orid['id']}" class="visuallyhidden">Activate</label> {* i18n *}
                 </div>
             {/if}
                 <span>{$items[{$orid['id']}]['display']}</span>