cleanup commented-out code