remove unicode dependency
merge
merge