Removing some things, updating other things