diff --git a/e107_core/shortcodes/batch/user_shortcodes.php b/e107_core/shortcodes/batch/user_shortcodes.php
index f532dc213..22b6f27d6 100644
--- a/e107_core/shortcodes/batch/user_shortcodes.php
+++ b/e107_core/shortcodes/batch/user_shortcodes.php
@@ -281,27 +281,6 @@ class user_shortcodes extends e_shortcode
 			//return "<span class='e-email' data-user='".$user."' data-dom='".$dom."'>&#64;</span>";
 		}
 
-		      ########################################################
-		       # Security Note - 04 May 2013                          #
-		       ########################################################
-		       #                                                      #
-		       # The CSS code direction rtl is an effective way to    #
-		       # prevent spam bots from scraping emails that are      #
-		       # not hidden.                                          #
-		       #                                                      #
-		       # You can find empirical support for this method at    #
-		       # <http://superuser.com/a/235965>.                     #
-		       #                                                      #
-		       # {e_CORE}templates/user_template.php was modified to  #
-		       # support this code.  In $USER_FULL_TEMPLATE, the      #
-		       # LAN_USER_60 value {USER_EMAIL_LINK} was changed to   #
-		       # {USER_EMAIL}.  I couldn't figure out how the two     #
-		       # shortcodes were different, so I took precautions in  #
-		       # hopes that the CSS direction won't break actual HTML #
-		       # tags.                                                #
-		       #                                                      #
-		       #       -- Deltik                                      #
-		       ########################################################
 	}
 
 
diff --git a/e107_handlers/message_handler.php b/e107_handlers/message_handler.php
index d2d78f063..f42770015 100644
--- a/e107_handlers/message_handler.php
+++ b/e107_handlers/message_handler.php
@@ -17,18 +17,13 @@ if (!defined('e107_INIT')) { exit; }
 
 /*
  * Type defines
- * XXX - convert to eMessage class constants
- * @note 07 May 2013: These have been converted to eMessage class constants!
- *       Example: eMessage::E_MESSAGE_SUCCESS is 'success'
- *             -- Deltik
- *       P.S. Now somebody needs to get rid of these universal constants...
  */
-define('E_MESSAGE_INFO', 		'info');
-define('E_MESSAGE_SUCCESS', 	'success');
-define('E_MESSAGE_WARNING', 	'warning');
-define('E_MESSAGE_ERROR', 		'error');
-define('E_MESSAGE_DEBUG', 		'debug');
-define('E_MESSAGE_NODISPLAY',	'nodisplay'); // Appears to be needed by update_routine
+define('E_MESSAGE_INFO',      'info');
+define('E_MESSAGE_SUCCESS',   'success');
+define('E_MESSAGE_WARNING',   'warning');
+define('E_MESSAGE_ERROR',     'error');
+define('E_MESSAGE_DEBUG',     'debug');
+define('E_MESSAGE_NODISPLAY', 'nodisplay'); // Appears to be needed by update_routine
 
 //FIXME - language file! new?