; and (iii) by striking subsection (b). (B) The item relating to section 3051 in the table of sections for chapter 203 of title 18, United States Code, is amended to read as follows: 3051. Powers of certain investigators and officers of the Department of Justice. . (e) Amendment to the National Drug Control Policy Reauthorization Act of 1998 Section 716(c)(1)(B) of the National Drug Control Policy Reauthorization Act of 1998 ( 21 U.S.C. 1714(c)(1)(B) ) is amended by striking Agency, the Bureau of Alcohol, Tobacco, Firearms, and Explosives, and inserting Administration . (f) Amendments to the Internal Revenue Code of 1986 (1) Section 6103(i)(8)(A) of the Internal Revenue Code of 1986 ( 26 U.S.C. 6103(i)(8)(A) ) is amended by striking making— and all that follows through (ii) . (2) Section 7801(a)(2)(A) of such Code ( 26 U.S.C. 7801(a)(2)(A) ) is amended by striking Bureau of Alcohol, Tobacco, Firearms, and Explosives and inserting Federal Bureau of Investigation . (g) Amendments to title 28 , United States Code (1) Section 530C(b)(2) of title 28, United States Code, is amended by striking for the Bureau of Alcohol, Tobacco, Firearms, and Explosives, each place it appears. (2) Chapter 40A of such title (28 U.S.C. 599A–599B) is repealed. (3) Section 2006(2) of such title is amended by striking , the Director, Bureau of Alcohol, Tobacco, Firearms, and Explosives, Department of Justice, . (h) Amendments to the Violence Against Women and Department of Justice Reauthorization Act of 2005 Section 1107(a) of Violence Against Women and Department of Justice Reauthorization Act of 2005 ( 28 U.S.C. 534 note) is amended by striking paragraph (2) and redesignating paragraphs (3) through (13) as paragraphs (2) through (12), respectively. (i) Amendments to title 31 , United States Code (1) (A) Section 713 of title 31, United States Code, is amended— (i) in the section heading, by striking Service, Tax and Trade Bureau, and Bureau of Alcohol, Tobacco, Firearms, and Explosives and inserting Service and Tax and Trade Bureau