Add (hopefully) better utf-8 support"
Remove old, unused code