shall the proceeds of such trade or acts be considered the proceeds of illegal drug trade or any kind of criminal or illicit activity under sections 981, 1956 or 1957 of title 18, United States Code, or any other provision of law, even if such activity occurred before the date of enactment of this Act. (1) Limitation to only cannabis This provision applies solely to persons who traded exclusively in marijuana, marihuana as defined in section 102(16) of the Controlled Substances Act ( 21 U.S.C. 802(16) ), or tetrahydrocannabinols rather than other substances controlled under the Controlled Substances Act. (2) Scope This provision applies to each and every organ of the Federal Government. (3) Post-passage limitation This provision does not apply to acts or transaction occurring after the passage of this Act that are not in compliance with this Act and other applicable laws. (d) Application to military law Notwithstanding any other provision of law, the provisions of subsection (a) shall apply to proceedings involving military courts, tribunals, courts-martial, and offenses under the Uniform Code of Military Justice. Former servicemembers and veterans that received other than honorable, bad conduct, or dishonorable discharges premised solely on nonviolent cannabis offenses covered under this subsection (a) shall be entitled to petition and receive from a service branch discharge review board or the Board of Correction for Military Records, as jurisdictionally appropriate, an upgrade to a general discharge. (e) Expungement of nonviolent federal cannabis offenses Section 3607(c) of title 18, United States Code, is amended— (1) by striking If the case and inserting (1) If the case