removed some extra, unneeded lines