clean up unicode, including legacy from 2.*