Clean up unicode conversion