Merge "remove unicode from code"