Strip lang for removed features

Change-Id: Ie0ffed8838607893957c02ad4b77971cdad4d996