Removed TextHelper hacks