; and (5) $72,000,000 for fiscal year 2025; ; (2) in subsection (b)— (A) by striking fiscal years 2016 through 2020 and inserting fiscal years 2021 through 2025 ; and (B) by striking $21,988,000 and inserting $24,025,000 ; (3) in subsection (c) by striking $4,000,000 for each of fiscal years 2016 through 2020 and inserting $5,000,000 for each of fiscal years 2021 through 2025 ; (4) in subsection (d) by striking $1,000,000 for each of fiscal years 2016 through 2020 and inserting $4,000,000 for each of fiscal years 2021 through 2025 ; (5) by redesignating subsection (e) as subsection (f); and (6) by inserting after subsection (d) the following: (e) Assistance with local emergency responder training grants From the Hazardous Materials Emergency Preparedness Fund established under section 5116(h), the Secretary may expend $1,800,000 for each of fiscal years 2021 through 2025 to carry out the grant program under section 5107(j). . II Hazardous Materials Safety and Improvement 8201. Repeal of certain requirements related to lithium cells and batteries (a) Repeal Section 828 of the FAA Modernization and Reform Act of 2012 ( 49 U.S.C. 44701 note), and the item relating to such section in the table of contents in section 1(b) of such Act, are repealed. (b) Conforming amendments Section 333 of the FAA Reauthorization Act of 2018 ( 49 U.S.C. 44701 note) is amended— (1) in subsection (a)— (A) in paragraph (1)— (i) by striking (A) In general.— and all that follows through the Secretary and inserting The Secretary ; and (ii) by striking subparagraph (B); and (B) in paragraph (2) by striking Pursuant to section 828 of the FAA Modernization and Reform Act of 2012 ( 49 U.S.C. 44701 note), the Secretary and inserting The Secretary ; (2) by striking paragraph (4) of subsection (b)