diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 1a7d52a38b..be6916442b 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -183,7 +183,6 @@ define('BBCODE_ID_LIST', 9);
 define('BBCODE_ID_EMAIL', 10);
 define('BBCODE_ID_FLASH', 11);
 define('BBCODE_ID_ATTACH', 12);
-define('BBCODE_ID_MENTION', 13);
 
 // BBCode hard limit
 define('BBCODE_LIMIT', 1511);
diff --git a/phpBB/phpbb/textformatter/data_access.php b/phpBB/phpbb/textformatter/data_access.php
index bbb6ba0f0d..808c1ea04e 100644
--- a/phpBB/phpbb/textformatter/data_access.php
+++ b/phpBB/phpbb/textformatter/data_access.php
@@ -138,7 +138,7 @@ class data_access
 			'email' => 10,
 			'flash' => 11,
 			'attachment' => 12,
-			'mention' => 13,
+			'mention' => 13, // TODO: change ID/remove?
 		);
 
 		$styles = array();