Remove some stuff here aswell