diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 7afffed2de..ccf6a0f51a 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1721,7 +1721,7 @@ fieldset.submit-buttons legend {
 	height: 40px;
 }
 
-svg.mention-media-avatar { /* TODO: remove it after general normalization */
+svg { /* TODO: remove it after general normalization */
 	fill: currentColor;
 }
 
diff --git a/phpBB/assets/javascript/editor.js b/phpBB/assets/javascript/editor.js
index d57cb7ed51..5b3725d63f 100644
--- a/phpBB/assets/javascript/editor.js
+++ b/phpBB/assets/javascript/editor.js
@@ -480,7 +480,6 @@ function getCaretPosition(txtarea) {
 				at: "@",
 				acceptSpaceBar: true,
 				displayTpl: function(data) {
-					// TODO: handle image scaling
 					let avatar = (data.avatar.img) ? "<span class='mention-media-avatar'>" + data.avatar.img + "</span>" : defaultAvatar(data.avatar.type),
 						rank = (data.rank) ? "<span class='mention-rank'>" + data.rank + "</span>" : '';
 					return "<li class='mention-item'><span class='mention-media'>" + avatar + "</span><span class='mention-name'>" + data.name + rank + "</span></li>";
diff --git a/phpBB/phpbb/notification/type/mention.php b/phpBB/phpbb/notification/type/mention.php
index 1ec8cc51ce..2dda929d5b 100644
--- a/phpBB/phpbb/notification/type/mention.php
+++ b/phpBB/phpbb/notification/type/mention.php
@@ -91,7 +91,6 @@ class mention extends \phpbb\notification\type\post
 
 	/**
 	* Update a notification
-	* TODO: decide what to do with this stuff
 	*
 	* @param array $post Data specific for this type that will be updated
 	* @return true
diff --git a/phpBB/phpbb/textformatter/data_access.php b/phpBB/phpbb/textformatter/data_access.php
index 808c1ea04e..27ce778904 100644
--- a/phpBB/phpbb/textformatter/data_access.php
+++ b/phpBB/phpbb/textformatter/data_access.php
@@ -138,7 +138,6 @@ class data_access
 			'email' => 10,
 			'flash' => 11,
 			'attachment' => 12,
-			'mention' => 13, // TODO: change ID/remove?
 		);
 
 		$styles = array();
diff --git a/phpBB/styles/prosilver/theme/mentions.css b/phpBB/styles/prosilver/theme/mentions.css
index b3d9950f28..291f8ed092 100644
--- a/phpBB/styles/prosilver/theme/mentions.css
+++ b/phpBB/styles/prosilver/theme/mentions.css
@@ -43,7 +43,7 @@
 	height: 40px;
 }
 
-svg.mention-media-avatar { /* TODO: remove it after general normalization */
+svg { /* TODO: remove it after general normalization */
 	fill: currentColor;
 }