removing unneeded code