; and (iii) by redesignating subparagraph (H) as subparagraph (G); (B) in paragraph (2)— (i) in subparagraph (F), by inserting or after the semicolon; (ii) by striking subparagraph (G); and (iii) by redesignating subparagraph (H) as subparagraph (G); (C) in paragraph (3), by striking paragraphs (1), (2), and (4) and inserting paragraphs (1) and (2) ; (D) by striking paragraph (4); and (E) by redesignating paragraphs (5), (6), and (7) as paragraphs (4), (5), and (6), respectively. (c) Other conforming amendments (1) National forest system drug control act of 1986 The National Forest System Drug Control Act of 1986 ( 16 U.S.C. 559b et seq. ) is amended— (A) in section 15002(a) ( 16 U.S.C. 559b(a) ) by striking marijuana and other ; (B) in section 15003(2) ( 16 U.S.C. 559c(2) ) by striking marijuana and other ; and (C) in section 15004(2) ( 16 U.S.C. 559d(2) ) by striking marijuana and other . (2) Interception of communications Section 2516 of title 18, United States Code, is amended— (A) in subsection (1)(e), by striking marihuana, ; and (B) in subsection (2) by striking marihuana . (3) FMCSA provisions (A) Conforming amendment Section 31301(5) of title 49, United States Code, is amended by striking section 31306, and inserting sections 31306, 31306a, and subsections (b) and (c) of section 31310, . (B) Definition Section 31306(a) of title 49, United States Code, is amended— (i) by striking means any substance and inserting the following: means— (A) any substance