More work to clean Mandarin

Check from 3588 to 3653 for next commit