removing unneeded stuffs