get rid of scattered commented-out code