Remove unwanted things, added some new wanted ones.