removed some commented-out lines