Cleanup, utf-8 compatible