Merge "Remove unicode from code"