Removing unneeded stuff