Cleanup unused imports and more unicodifying for bug #3.