Removed import and calling of code from a botched commit, preparing to rewrite MessageHelper.

Signed-off-by: Ken 'Minalien' Murray <minalien@gmail.com>