; (B) the administration and wind-up, during the wind-up period, of any outstanding obligations of the Federal Government under any programs of the Agency that are terminated by this section; and (C) taking such other actions as may be necessary to wind-up any outstanding affairs of the Agency before the end of the wind-up period. 3. Conforming amendments (a) CERCLA The Comprehensive Environmental Response, Compensation, and Liability Act of 1980 ( 42 U.S.C. 9601 et seq.) is amended— (1) in section 104 ( 42 U.S.C. 9604 ), by amending subsection (i) to read as follows: (i) The Secretary of Health and Human Services shall, in cooperation with the States, maintain a national registry of serious diseases and illnesses and a national registry of persons exposed to toxic substances. ; (2) in section 111 ( 42 U.S.C. 9611 )— (A) by striking subsection (c)(4); and (B) by striking subsection (m); and (3) in section 310(a)(2) ( 42 U.S.C. 9659(a)(2) ), by striking and the Administrator of the ATSDR . (b) Other conforming changes (1) Section 2704 of title 10, United States Code, is amended by striking subsection (f). (2) Section 405(d)(1) of the Toxic Substances Control Act ( 15 U.S.C. 2601(d)(1) ) is amended by striking acting through the Director of the Agency for Toxic Substances and Disease Registry, . (3) Section 209(c)(1)(A) of the Fire Administration Authorization Act of 1992 ( 29 U.S.C. 671a(c)(1)(A) ) is amended by striking the Administrator of the Agency for Toxic Substances and Disease Registry, . (4) Section 118(e)(3)(A) of the Federal Water Pollution Control Act ( 33 U.S.C. 1268(e)(3)(A) ) is amended by striking , in consultation with the Research Office, the Agency for Toxic Substances and Disease Registry, and Great Lakes States and inserting , in consultation with the Research Office and Great Lakes States, . (5) Section 317F(a) of the Public Health Service Act ( 42 U.S.C. 247b–7(a) ) is amended— (A) in paragraph (1), by striking and the Agency for Toxic Substances and Disease Registry