Done some more updates to remove Mandarin