Remove some infelicities