removed some extra unneeded code