Remove accidentally committed cruft. Fix accidental comment edit.