removed some unnecessary commented-out code