removing some commented-out code