remove commented out/unneeded code