cleared out some commented-out code