Remove some things, add some things