Remove extraneous commented-out code