Clean up ... unicode version