remove some stuff, add other