Some cleanup of commented-out code.
Some cleanup of commented-out code.