getting rid of unneeded code