more commented-out code deleted