; and (II) not later than 4 years after the date of the enactment of this paragraph, that includes recommendations for the continuation or expansion of the program established under this paragraph and improving the process for providing such assistance. (I) Definitions In this paragraph: (i) Eligible entity The term eligible entity means a nonprofit organization that meets the criteria described under subparagraph (C). (ii) Covered individual The term covered individual means an individual recovering from an opioid use disorder or other substance use disorder. . 3. Repeal of Rental Voucher Demonstration Program Effective the day that is 5 years after the date of the enactment of this Act, paragraph (21) of section 8(o) of the United States Housing Act of 1937 ( 42 U.S.C. 1437f(o) ), as added by this Act, is repealed. 4. Return of vouchers An eligible entity that provided vouchers for rental assistance under paragraph (21) of section 8(o) of the United States Housing Act of 1937 ( 42 U.S.C. 1437f(o) ), as added by this Act, shall return any such vouchers to the Secretary of Housing and Urban Development on the day that is 5 years after the date of the enactment of this Act.