Remove commented-out code claimed to be 'basic cleanup'.