fixed unneeded code