deleted lots of dead/commented-out code