diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index e82fd92..374141a 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -2269,9 +2269,6 @@ function theme_table($variables) {
  * @param array $variables
  *   An associative array containing:
  *   - style: Set to either 'asc' or 'desc'. This determines which icon to show.
- *
- * @todo Remove this preprocess function and consolidate with 'image' as per
- *   http://drupal.org/node/1973418
  */
 function template_preprocess_tablesort_indicator(&$variables) {
   // Provide the image attributes for an ascending or descending image.
diff --git a/core/modules/system/templates/tablesort-indicator.html.twig b/core/modules/system/templates/tablesort-indicator.html.twig
index 3e038e9..f5e9c92 100644
--- a/core/modules/system/templates/tablesort-indicator.html.twig
+++ b/core/modules/system/templates/tablesort-indicator.html.twig
@@ -13,8 +13,6 @@
  *
  * @ingroup themeable
  */
-  @todo Remove this template and consolidate with 'image' as per
-  http://drupal.org/node/1973418
 #}
 {% spaceless %}
   {{ image }}