Why these 2 commented out lines? Seems like 618 should stay and 619 go.