more unicode cleanup