Reversion fix and removal of unused code.
Merge pull request #246 from TheMightyBuzzard/unicode-quickfix

Reversion fix and removal of unused code.