Part 2 of previous commit: Remove pinyin