; and (2) by striking the final two sentences. 808. General waiver for aliens previously removed and for the unlawful presence bars (a) In general Section 212(d) ( 8 U.S.C. 1182(d) ) is amended by adding at the end the following: (14) The Secretary of Homeland Security may, in the discretion of the Secretary, for humanitarian purposes, to assure family unity, or when it is otherwise in the public interest, waive the application of subparagraph (A) or (B)(i) of subsection (a)(9). . (b) Conforming amendment Section 212(a)(9)(B) of such Act ( 8 U.S.C. 1182(a)(9)(B) ) is amended by striking clause (v). 809. Waiver of aggravated felony consequences Section 101 ( 8 U.S.C. 1101 ) is amended by adding at the end the following: (j) For purposes of this Act, and notwithstanding subsection (a)(43), the Secretary of Homeland Security may treat any conviction that did not result in incarceration for more than 1 year as if such conviction were not a conviction for an aggravated felony. This discretion may be exercised for humanitarian purposes, to assure family unity, or when it is otherwise in the public interest. . 810. Discretionary waiver to admit persons in unusual circumstances (a) New general waiver Section 212(d) ( 8 U.S.C. 1182(d) ) is amended by adding at the end the following: (15) The Secretary of Homeland Security may, in the discretion of such Secretary for humanitarian purposes, to assure family unity, or when it is otherwise in the public interest, waive the application of subparagraph (B) or (G) of subsection (a)(6), clause (i) or (ii) of subsection (a)(9)(A), or subsection (a)(9)(B)(i), in unusual circumstances. For purposes of the preceding sentence, an instance of battering or extreme cruelty is deemed to constitute unusual circumstances in the case where it is inflicted on an alien (or a child of an alien) by the alien’s United States citizen or lawful permanent resident spouse, parent, child, son, or daughter. . (b) Waiver for aliens previously removed (1) Certain aliens previously removed Section