removing unneeded stuff