Remove some stuff from startup, add some stuff.