Merge "remove unicode prefix from code"