Remove merged unicode support fixes