remove some things. add some things