Moved email stripping into string class to actually fix problem