Remove more extra features