Cleanup unicode conversion