Remove technical debt from Messages.subs.php