unneeded code removed