get rid of unneeded code