; and (3) by adding at the end the following: (7) Any person carrying a pistol who holds— (A) a valid license issued under section 6; or (B) any out-of-state license, as defined in section 1. . 13. Including toy and antique pistols in prohibition against using an imitation firearm to commit a violent or dangerous crime Section 13 of the Act of July 8, 1932 (sec. 22–4513, D.C. Official Code), is amended by striking section 2 and section 14(b) and inserting sections 2, 4(b), and 14(b) . 14. Repeal of gun offender registry Title VIII of the Firearms Control Regulations Act of 1975 (sec. 7–2508.01 et seq., D.C. Official Code), as added by section 205 of the Omnibus Public Safety and Justice Amendment Act of 2009 (D.C. Law 18–88), is repealed. 15. Repeals of District of Columbia Acts Effective on the day before the date of the enactment of this Act, each of the following Acts is repealed, and any provision of law amended or repealed by any of such Acts is restored or revived as if such Act had not been enacted into law: (1) The Assault Weapon Manufacturing Strict Liability Act of 1990 (D.C. Law 8–263). (2) The Illegal Firearm Sale and Distribution Strict Liability Act of 1992 (D.C. Law 9–115). (3) The Firearms Registration Amendment Act of 2008 (D.C. Law 17–372). (4) The Inoperable Pistol Amendment Act of 2008 (D.C. Law 17–388). (5) The Firearms Amendment Act of 2012 (D.C. Law 19–170). (6) The Administrative Disposition for Weapons Offenses Amendment Act of 2012 (D.C. Law 19–295). (7) The License to Carry a Pistol Amendment Act of 2014 (D.C. Law 20–279). 16. Severability Notwithstanding any other provision of this Act, if any provision of this Act, or any amendment made by this Act, or the application of such provision or amendment to any person or circumstance is held to be unconstitutional, the other provisions of this Act and any other amendments made by this Act, and the application of such provision or amendment to other persons or circumstances, shall not be affected thereby.