Took out more features