Remove some stuff
Clean up