I don't think we should leave in the commented-out lines.