diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json
index 9ce082d7ae6f9..07b72b8a27e16 100644
--- a/data/json/itemgroups/Clothing_Gear/clothing.json
+++ b/data/json/itemgroups/Clothing_Gear/clothing.json
@@ -3382,7 +3382,6 @@
       [ "balclava", 12 ],
       [ "mask_survivorxl", 2 ],
       [ "combatsaw_off", 1 ],
-      [ "bigun", 2 ],
       [ "ashot", 4 ],
       [ "pickaxe", 1 ],
       [ "makeshift_machete", 4 ],
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
index 784ada27d862b..07d8c3e8003c7 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -100,7 +100,6 @@
       { "item": "sw_619", "prob": 40 },
       { "item": "bfr", "prob": 10 },
       { "item": "raging_bull", "prob": 15 },
-      { "item": "raging_judge", "prob": 15 },
       { "item": "sw_500", "prob": 10 },
       { "group": "modular_deagle_357", "prob": 2 },
       { "group": "modular_deagle_44", "prob": 5 },
@@ -138,7 +137,6 @@
       { "group": "nested_mr73", "prob": 8 },
       { "group": "nested_pistol_flintlock", "prob": 150 },
       { "group": "nested_raging_bull", "prob": 100 },
-      { "group": "nested_raging_judge", "prob": 20 },
       { "group": "nested_tokarev", "prob": 100 },
       { "group": "nested_walther_ppk", "prob": 100 },
       { "group": "guns_pistol_collectible", "prob": 1 }
@@ -258,7 +256,7 @@
     "id": "guns_smg_obscure",
     "subtype": "distribution",
     "//": "Imported or otherwise very obscure SMGs.",
-    "items": [ { "item": "ppsh", "prob": 50 }, { "item": "hk_mp5_10_semi", "prob": 1 }, { "item": "greasegun", "prob": 150 } ]
+    "items": [ { "item": "hk_mp5_10_semi", "prob": 1 }, { "item": "greasegun", "prob": 150 } ]
   },
   {
     "type": "item_group",
@@ -564,7 +562,6 @@
     "subtype": "distribution",
     "entries": [
       { "group": "nested_ksg", "prob": 50 },
-      { "group": "nested_ksg-25", "prob": 8 },
       { "group": "nested_tavor_12", "prob": 5 },
       { "group": "nested_m1014", "prob": 10 },
       { "group": "nested_slp", "prob": 10 }
@@ -578,7 +575,6 @@
     "subtype": "distribution",
     "entries": [
       { "item": "ksg", "prob": 50, "charges": [ 0, 7 ] },
-      { "item": "ksg-25", "prob": 8, "charges": [ 0, 12 ] },
       { "item": "tavor_12", "prob": 5, "charges": [ 0, 5 ] },
       { "item": "mossberg_930", "variant": "m1014", "prob": 10, "charges": [ 0, 8 ] },
       { "item": "mossberg_590", "variant": "slp", "contents-item": [ "rail_mount" ], "prob": 10, "charges": [ 0, 9 ] }
@@ -659,7 +655,6 @@
     "//": "Makeshift or otherwise poor quality shotguns.",
     "items": [
       { "item": "blunderbuss", "prob": 70 },
-      { "item": "bigun", "prob": 10, "charges": [ 0, 6 ] },
       { "item": "pipe_double_shotgun", "prob": 70, "charges": [ 0, 2 ] },
       { "item": "pipe_shotgun", "prob": 100 },
       { "item": "revolver_shotgun", "prob": 30, "charges": [ 0, 6 ] }
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json
index 2779a673dfe8b..bab181a3f6d6b 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json
@@ -377,7 +377,6 @@
       { "item": "sw_500", "prob": 15 },
       { "item": "walther_p38", "prob": 10 },
       { "item": "raging_bull", "prob": 10 },
-      { "item": "raging_judge", "prob": 20 },
       { "item": "mauser_m714", "prob": 15 },
       { "item": "m1911-460", "prob": 10 },
       { "item": "bfr", "prob": 10 },
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
index a0f9c03b802aa..58d575e1b0778 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
@@ -207,7 +207,6 @@
       [ "22_speedloader8", 15 ],
       [ "44_speedloader6", 15 ],
       [ "454_speedloader5", 5 ],
-      [ "454_speedloader6", 5 ],
       [ "500_speedloader5", 5 ],
       [ "glock_drum_50rd", 5 ],
       [ "glock_drum_100rd", 5 ],
@@ -256,8 +255,7 @@
       { "item": "38_speedloader", "prob": 40, "charges": 0 },
       { "item": "40_speedloader6", "prob": 30, "charges": 0 },
       { "item": "44_speedloader6", "prob": 30, "charges": 0 },
-      { "item": "454_speedloader5", "prob": 20, "charges": 0 },
-      { "item": "454_speedloader6", "prob": 20, "charges": 0 }
+      { "item": "454_speedloader5", "prob": 20, "charges": 0 }
     ]
   },
   {
@@ -304,11 +302,6 @@
     "id": "mags_smg_rare",
     "//": "Aftermarket or otherwise uncommon SMG magazines excluding milspec.",
     "items": [
-      [ "a180mag", 1 ],
-      [ "a180mag1", 1 ],
-      [ "a180mag2", 1 ],
-      [ "a180mag3", 1 ],
-      [ "a180mag4", 1 ],
       [ "calicomag", 19 ],
       [ "calicomag_100rd", 15 ],
       [ "fnp90mag", 150 ],
@@ -573,8 +566,6 @@
       [ "mp40mag_32rd", 5 ],
       [ "p08mag_32rd", 1 ],
       [ "p08mag_8rd", 10 ],
-      [ "ppshmag", 10 ],
-      [ "ppshdrum", 10 ],
       [ "rpk74mag", 10 ],
       [ "tokarevmag", 10 ],
       [ "greasegun30mag", 5 ]
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
index ea1c1386ae507..9c5bfc1b05622 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
@@ -913,14 +913,6 @@
     "ammo": 100,
     "entries": [ { "item": "raging_bull" }, { "group": "on_hand_454" } ]
   },
-  {
-    "id": "nested_raging_judge",
-    "type": "item_group",
-    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
-    "subtype": "collection",
-    "ammo": 100,
-    "entries": [ { "item": "raging_judge" }, { "group": "on_hand_454" } ]
-  },
   {
     "id": "nested_tokarev",
     "type": "item_group",
@@ -1213,19 +1205,6 @@
       { "group": "on_hand_45" }
     ]
   },
-  {
-    "id": "nested_american_180",
-    "type": "item_group",
-    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
-    "subtype": "collection",
-    "ammo": 100,
-    "entries": [
-      { "item": "american_180", "charges": [ 0, 100 ] },
-      { "item": "a180mag" },
-      { "item": "a180mag", "prob": 50 },
-      { "group": "on_hand_22" }
-    ]
-  },
   {
     "id": "nested_briefcase_smg",
     "type": "item_group",
@@ -2140,14 +2119,6 @@
     "ammo": 100,
     "entries": [ { "item": "ksg", "charges": [ 0, 7 ] }, { "group": "on_hand_shot" } ]
   },
-  {
-    "id": "nested_ksg-25",
-    "type": "item_group",
-    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
-    "subtype": "collection",
-    "ammo": 100,
-    "entries": [ { "item": "ksg", "charges": [ 0, 12 ] }, { "group": "on_hand_shot" } ]
-  },
   {
     "id": "nested_tavor_12",
     "type": "item_group",
diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json
index fbd07b0d6d7d6..b1028df3c0c84 100644
--- a/data/json/items/gun/22.json
+++ b/data/json/items/gun/22.json
@@ -1,57 +1,4 @@
 [
-  {
-    "id": "american_180",
-    "looks_like": "hk_mp5",
-    "type": "GUN",
-    "reload_noise_volume": 10,
-    "name": { "str": ".22 caliber submachine gun" },
-    "description": "A dramatically uncommon automatic weapon, making use of high-capacity pan magazines and firing the low power .22 caliber cartridge: an unusual ammunition choice for a submachine gun.  With negligible recoil on account of its modest cartridge and a suppressively high rate of fire, a burst of .22 LR rounds from this little machine gun can be best likened with a swarm of hornets… an incredibly angry swarm of hornets.",
-    "variant_type": "gun",
-    "variants": [
-      {
-        "id": "american_180",
-        "name": { "str": "American-180 submachine gun" },
-        "description": "The American-180 is a submachine gun developed in the 1960s that fires .22 LR, unusual for an SMG.  Though the round is low-powered, the high rate of fire and large magazine makes the 180 a formidable weapon."
-      }
-    ],
-    "weight": "2585 g",
-    "volume": "2200 ml",
-    "longest_side": "905 mm",
-    "barrel_length": "470 mm",
-    "price": "1 kUSD 630 USD",
-    "price_postapoc": "25 USD",
-    "to_hit": -2,
-    "material": [ "steel" ],
-    "symbol": "(",
-    "color": "light_gray",
-    "range": 6,
-    "ammo": [ "22" ],
-    "skill": "smg",
-    "ranged_damage": { "damage_type": "bullet", "amount": 4 },
-    "dispersion": 280,
-    "durability": 6,
-    "min_cycle_recoil": 39,
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 6 ] ],
-    "barrel_volume": "250 ml",
-    "valid_mod_locations": [
-      [ "barrel", 1 ],
-      [ "brass catcher", 1 ],
-      [ "grip", 1 ],
-      [ "mechanism", 2 ],
-      [ "muzzle", 1 ],
-      [ "rail", 1 ],
-      [ "sights", 1 ],
-      [ "sling", 1 ],
-      [ "stock", 1 ],
-      [ "stock accessory", 2 ],
-      [ "underbarrel", 1 ]
-    ],
-    "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
-    "pocket_data": [
-      { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "a180mag", "a180mag1", "a180mag2", "a180mag3", "a180mag4" ] }
-    ],
-    "melee_damage": { "bash": 11 }
-  },
   {
     "id": "marlin_9a",
     "looks_like": "ar15",
diff --git a/data/json/items/gun/454.json b/data/json/items/gun/454.json
index 17325ff882cdd..efb4f42e5604c 100644
--- a/data/json/items/gun/454.json
+++ b/data/json/items/gun/454.json
@@ -31,27 +31,5 @@
       }
     ],
     "melee_damage": { "bash": 12 }
-  },
-  {
-    "id": "raging_judge",
-    "copy-from": "raging_bull",
-    "looks_like": "sw_619",
-    "type": "GUN",
-    "name": { "str_sp": "Taurus Raging Judge Magnum" },
-    "description": "The Taurus Raging Judge Magnum is a 6-shot revolver chambered in .454 Casull.  It can fire .410 shotshells and .45 Colt cartridges as well.",
-    "weight": "2070 g",
-    "volume": "1175 ml",
-    "longest_side": "385 mm",
-    "barrel_length": "241 mm",
-    "//": "165.1 + 76mm max OAL for .410 3in. Revolvers just built different.",
-    "clip_size": 6,
-    "pocket_data": [
-      {
-        "pocket_type": "MAGAZINE",
-        "holster": true,
-        "ammo_restriction": { "454": 6, "410shot": 6, "45colt": 6 },
-        "allowed_speedloaders": [ "454_speedloader6" ]
-      }
-    ]
   }
 ]
diff --git a/data/json/items/gun/762x25.json b/data/json/items/gun/762x25.json
index 3c030aea0d8d7..37fdce1c2f49a 100644
--- a/data/json/items/gun/762x25.json
+++ b/data/json/items/gun/762x25.json
@@ -1,55 +1,4 @@
 [
-  {
-    "id": "ppsh",
-    "looks_like": "hk_mp5",
-    "type": "GUN",
-    "reload_noise_volume": 10,
-    "name": { "str": "PPSh-41 submachine gun" },
-    "description": "The Soviet-made PPSh-41 is a mass-produced selective-fire submachine gun.  It has a relatively high rate of fire.",
-    "variant_type": "gun",
-    "variants": [
-      {
-        "id": "ppsh",
-        "name": { "str": "PPSh-41 submachine gun" },
-        "description": "A bulky and simple Second World War submachine gun of Russian manufacture, composed from a basic wooden buttstock, steel barrel shroud, and the hopes and prayers of Soviet soldiers under threat of German invasion.  Designed for mass production with limited materials, the weapon is notable for its high-capacity drum magazines, capability of rapidly depleting said magazines, and vicious 7.62x25mm chambering."
-      }
-    ],
-    "weight": "3640 g",
-    "volume": "2873 ml",
-    "longest_side": "844 mm",
-    "barrel_length": "269 mm",
-    "price": "2 kUSD 800 USD",
-    "price_postapoc": "22 USD 50 cent",
-    "to_hit": -2,
-    "material": [ "steel", "wood" ],
-    "symbol": "(",
-    "color": "brown",
-    "ammo": [ "762x25" ],
-    "skill": "smg",
-    "range": 2,
-    "ranged_damage": { "damage_type": "bullet", "amount": 2 },
-    "dispersion": 120,
-    "durability": 8,
-    "min_cycle_recoil": 270,
-    "barrel_volume": "500 ml",
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
-    "valid_mod_locations": [
-      [ "barrel", 1 ],
-      [ "brass catcher", 1 ],
-      [ "grip", 1 ],
-      [ "mechanism", 2 ],
-      [ "muzzle", 1 ],
-      [ "sights", 1 ],
-      [ "sling", 1 ],
-      [ "stock mount", 1 ],
-      [ "stock accessory", 2 ],
-      [ "underbarrel", 1 ],
-      [ "rail mount", 1 ]
-    ],
-    "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "ppshmag", "ppshdrum" ] } ],
-    "melee_damage": { "bash": 10 }
-  },
   {
     "id": "tokarev",
     "copy-from": "pistol_base",
diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json
index 59320fdd4fe20..333b564151e7a 100644
--- a/data/json/items/gun/shot.json
+++ b/data/json/items/gun/shot.json
@@ -104,50 +104,6 @@
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 7 } } ],
     "melee_damage": { "bash": 9 }
   },
-  {
-    "id": "ksg-25",
-    "copy-from": "shotgun_pump",
-    "looks_like": "remington_870",
-    "type": "GUN",
-    "name": { "str": "extended bullpup shotgun" },
-    "description": "This pump-action shotgun uses a system of twin magazines to carry 24 total rounds of 12-gauge shotgun shells.  Each tube must be loaded separately, but this offers the option of loading different ammunition for different situations.  As the weapon's trigger is situated forwards of the chamber in what is termed as a 'bullpup' design, the firearm's still only as long as conventional shotguns despite having a comparatively far higher capacity.",
-    "variant_type": "gun",
-    "variants": [
-      {
-        "id": "ksg-25",
-        "name": { "str": "Kel-Tec KSG-25 shotgun" },
-        "description": "A bullpup pump-action shotgun, the Kel-Tec KSG-25 uses a pair of magazine tubes to increase its capacity.  Each tube has to be loaded separately, but this offers the option of loading different ammunition for different situations.  The big brother of the KSG, it has a longer barrel and longer magazine tubes."
-      }
-    ],
-    "ascii_picture": "ksg-25",
-    "weight": "2100 g",
-    "volume": "4495 ml",
-    "longest_side": "971 mm",
-    "barrel_length": "775 mm",
-    "price": "1 kUSD 400 USD",
-    "price_postapoc": "40 USD",
-    "to_hit": -1,
-    "material": [ "steel", "plastic" ],
-    "ranged_damage": { "damage_type": "bullet", "amount": 1 },
-    "dispersion": 425,
-    "sight_dispersion": 500,
-    "durability": 7,
-    "clip_size": 12,
-    "built_in_mods": [ "ksg25_aux_shotgun" ],
-    "valid_mod_locations": [
-      [ "barrel", 1 ],
-      [ "brass catcher", 1 ],
-      [ "grip mount", 1 ],
-      [ "mechanism", 2 ],
-      [ "muzzle", 1 ],
-      [ "rail mount", 1 ],
-      [ "sights", 1 ],
-      [ "sling", 1 ],
-      [ "underbarrel", 2 ]
-    ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 12 } } ],
-    "melee_damage": { "bash": 9 }
-  },
   {
     "id": "mossberg_500",
     "copy-from": "shotgun_pump_3gun",
diff --git a/data/json/items/gunmod/underbarrel.json b/data/json/items/gunmod/underbarrel.json
index d58e40cce7b69..8706e7b7fb455 100644
--- a/data/json/items/gunmod/underbarrel.json
+++ b/data/json/items/gunmod/underbarrel.json
@@ -274,35 +274,6 @@
     "flags": [ "RELOAD_ONE", "IRREMOVABLE" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "shot": 7 } } ]
   },
-  {
-    "id": "ksg25_aux_shotgun",
-    "copy-from": "underbarrel_base",
-    "type": "GUNMOD",
-    "name": { "str": "KSG-25 second magazine" },
-    "description": "The integrated second tube magazine of the Kel-Tec KSG-25, which holds 12 shots.  It's irremovable.",
-    "weight": "1550 g",
-    "volume": "1750 ml",
-    "price": "0 cent",
-    "price_postapoc": "0 cent",
-    "install_time": "0 s",
-    "material": [ "steel" ],
-    "symbol": ":",
-    "color": "light_red",
-    "location": "underbarrel",
-    "mod_targets": [ "shotgun" ],
-    "gun_data": {
-      "barrel_length": "775 mm",
-      "ammo": "shot",
-      "skill": "shotgun",
-      "ranged_damage": { "damage_type": "bullet", "amount": 5 },
-      "dispersion": 425,
-      "durability": 7,
-      "clip_size": 12,
-      "reload": 120
-    },
-    "flags": [ "RELOAD_ONE", "IRREMOVABLE" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "shot": 12 } } ]
-  },
   {
     "id": "ts12_aux_shotgun",
     "copy-from": "underbarrel_base",
diff --git a/data/json/items/magazine/22.json b/data/json/items/magazine/22.json
index 4cde0ff862059..1b62008ab2781 100644
--- a/data/json/items/magazine/22.json
+++ b/data/json/items/magazine/22.json
@@ -16,141 +16,6 @@
     "flags": [ "SPEEDLOADER" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 8 } } ]
   },
-  {
-    "id": "a180mag",
-    "looks_like": "mp5mag",
-    "type": "MAGAZINE",
-    "name": { "str": ".22 165-round magazine" },
-    "description": "An unusually-shaped pan magazine for use with .22 caliber submachine guns.",
-    "variant_type": "gun",
-    "variants": [
-      {
-        "id": "a180mag",
-        "name": { "str": "American-180 165-round magazine" },
-        "description": "An unusually-shaped pan magazine for the American-180."
-      }
-    ],
-    "weight": "1039 g",
-    "volume": "892 ml",
-    "longest_side": "14 cm",
-    "price": "73 USD",
-    "price_postapoc": "2 USD 50 cent",
-    "material": [ "steel" ],
-    "symbol": "#",
-    "color": "light_gray",
-    "ammo_type": [ "22" ],
-    "reload_time": 150,
-    "flags": [ "MAG_BULKY" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 165 } } ]
-  },
-  {
-    "id": "a180mag1",
-    "looks_like": "mp5mag",
-    "type": "MAGAZINE",
-    "name": { "str": ".22 165-round polymer magazine" },
-    "description": "An unusually-shaped polymer constructed pan magazine for use with .22 caliber submachine guns.",
-    "variant_type": "gun",
-    "variants": [
-      {
-        "id": "a180mag1",
-        "name": { "str": "American-180 polymer 165-round magazine" },
-        "description": "An unusually-shaped, polymer pan magazine for the American-180."
-      }
-    ],
-    "weight": "779 g",
-    "volume": "892 ml",
-    "longest_side": "14 cm",
-    "price": "73 USD",
-    "price_postapoc": "2 USD 50 cent",
-    "material": [ "plastic", "steel" ],
-    "symbol": "#",
-    "color": "light_gray",
-    "ammo_type": [ "22" ],
-    "reload_time": 150,
-    "flags": [ "MAG_BULKY" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 165 } } ]
-  },
-  {
-    "id": "a180mag2",
-    "looks_like": "mp5mag",
-    "type": "MAGAZINE",
-    "name": { "str": ".22 177-round magazine" },
-    "description": "An unusually-shaped pan magazine for use with .22 caliber submachine guns.",
-    "variant_type": "gun",
-    "variants": [
-      {
-        "id": "a180mag2",
-        "name": { "str": "American-180 177-round magazine" },
-        "description": "An unusually-shaped pan magazine for the American-180."
-      }
-    ],
-    "weight": "1133 g",
-    "volume": "973 ml",
-    "longest_side": "15 cm",
-    "price": "75 USD",
-    "price_postapoc": "3 USD",
-    "material": [ "steel" ],
-    "symbol": "#",
-    "color": "light_gray",
-    "ammo_type": [ "22" ],
-    "reload_time": 150,
-    "flags": [ "MAG_BULKY" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 177 } } ]
-  },
-  {
-    "id": "a180mag3",
-    "looks_like": "mp5mag",
-    "type": "MAGAZINE",
-    "name": { "str": ".22 220-round polymer magazine" },
-    "description": "An unusually-shaped polymer pan magazine for use with .22 caliber submachine guns.",
-    "variant_type": "gun",
-    "variants": [
-      {
-        "id": "a180mag3",
-        "name": { "str": "American-180 polymer 220-round magazine" },
-        "description": "An unusually-shaped polymer pan magazine for the American-180."
-      }
-    ],
-    "weight": "1258 g",
-    "volume": "1081 ml",
-    "longest_side": "16 cm",
-    "price": "80 USD",
-    "price_postapoc": "4 USD",
-    "material": [ "plastic", "steel" ],
-    "symbol": "#",
-    "color": "light_gray",
-    "ammo_type": [ "22" ],
-    "reload_time": 150,
-    "flags": [ "MAG_BULKY" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 220 } } ]
-  },
-  {
-    "id": "a180mag4",
-    "looks_like": "mp5mag",
-    "type": "MAGAZINE",
-    "name": { "str": ".22 275-round polymer magazine" },
-    "description": "An unusually-shaped polymer pan magazine for use with .22 caliber submachine guns.",
-    "variant_type": "gun",
-    "variants": [
-      {
-        "id": "a180mag4",
-        "name": { "str": "American-180 polymer 275-round magazine" },
-        "description": "An unusually-shaped polymer pan magazine for the American-180."
-      }
-    ],
-    "weight": "1258 g",
-    "volume": "1081 ml",
-    "longest_side": "17 cm",
-    "price": "80 USD",
-    "price_postapoc": "4 USD",
-    "material": [ "plastic", "steel" ],
-    "symbol": "#",
-    "color": "light_gray",
-    "ammo_type": [ "22" ],
-    "reload_time": 150,
-    "flags": [ "MAG_BULKY" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 275 } } ]
-  },
   {
     "id": "marlin_tubeloader",
     "looks_like": "stanag30",
diff --git a/data/json/items/magazine/454.json b/data/json/items/magazine/454.json
index bdcb876fb7a3f..69d843f6c09d8 100644
--- a/data/json/items/magazine/454.json
+++ b/data/json/items/magazine/454.json
@@ -16,13 +16,5 @@
     "ammo_type": [ "454", "45colt", "410shot" ],
     "flags": [ "SPEEDLOADER" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "454": 5, "45colt": 5, "410shot": 5 } } ]
-  },
-  {
-    "id": "454_speedloader6",
-    "copy-from": "454_speedloader5",
-    "type": "MAGAZINE",
-    "name": { "str": ".454 6-round speedloader" },
-    "description": "This speedloader can hold 5 rounds of .454, .45 Colt or .410 bore and quickly reload a compatible revolver.",
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "454": 6, "45colt": 6, "410shot": 6 } } ]
   }
 ]
diff --git a/data/json/items/magazine/762x25.json b/data/json/items/magazine/762x25.json
index b71ae44eaa91e..9d32ed5f0e814 100644
--- a/data/json/items/magazine/762x25.json
+++ b/data/json/items/magazine/762x25.json
@@ -1,43 +1,4 @@
 [
-  {
-    "id": "ppshdrum",
-    "//": "Provisional. Audited by previous PR, longest_side with ImageJ.",
-    "looks_like": "mp5mag",
-    "type": "MAGAZINE",
-    "name": { "str": "PPSh 71-round drum magazine" },
-    "description": "A high-capacity drum magazine for the PPSh-41.",
-    "weight": "1760 g",
-    "volume": "911 ml",
-    "longest_side": "14 cm",
-    "price": "70 USD",
-    "price_postapoc": "5 USD",
-    "material": [ "steel" ],
-    "symbol": "#",
-    "color": "light_gray",
-    "ammo_type": [ "762x25" ],
-    "reload_time": 190,
-    "flags": [ "MAG_BULKY" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762x25": 71 } } ]
-  },
-  {
-    "id": "ppshmag",
-    "//": "Audited with ImageJ.",
-    "looks_like": "mp5mag",
-    "type": "MAGAZINE",
-    "name": { "str": "PPSh 35-round magazine" },
-    "description": "A 35-round box magazine for the PPSh-41.",
-    "weight": "312 g",
-    "volume": "184 ml",
-    "longest_side": "230 mm",
-    "price": "22 USD",
-    "price_postapoc": "2 USD 50 cent",
-    "material": [ "steel" ],
-    "symbol": "#",
-    "color": "light_gray",
-    "ammo_type": [ "762x25" ],
-    "flags": [ "MAG_COMPACT" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762x25": 35 } } ]
-  },
   {
     "id": "tokarevmag",
     "//": "Audited from schematics.",
diff --git a/data/json/obsoletion_and_migration_0.I/gun.json b/data/json/obsoletion_and_migration_0.I/gun.json
new file mode 100644
index 0000000000000..b5a64995a1347
--- /dev/null
+++ b/data/json/obsoletion_and_migration_0.I/gun.json
@@ -0,0 +1,383 @@
+[
+  {
+    "id": "ppsh",
+    "looks_like": "hk_mp5",
+    "type": "GUN",
+    "reload_noise_volume": 10,
+    "name": { "str": "PPSh-41 submachine gun" },
+    "description": "The Soviet-made PPSh-41 is a mass-produced selective-fire submachine gun.  It has a relatively high rate of fire.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "ppsh",
+        "name": { "str": "PPSh-41 submachine gun" },
+        "description": "A bulky and simple Second World War submachine gun of Russian manufacture, composed from a basic wooden buttstock, steel barrel shroud, and the hopes and prayers of Soviet soldiers under threat of German invasion.  Designed for mass production with limited materials, the weapon is notable for its high-capacity drum magazines, capability of rapidly depleting said magazines, and vicious 7.62x25mm chambering."
+      }
+    ],
+    "weight": "3640 g",
+    "volume": "2873 ml",
+    "longest_side": "844 mm",
+    "barrel_length": "269 mm",
+    "price": "2 kUSD 800 USD",
+    "price_postapoc": "22 USD 50 cent",
+    "to_hit": -2,
+    "material": [ "steel", "wood" ],
+    "symbol": "(",
+    "color": "brown",
+    "ammo": [ "762x25" ],
+    "skill": "smg",
+    "range": 2,
+    "ranged_damage": { "damage_type": "bullet", "amount": 2 },
+    "dispersion": 120,
+    "durability": 8,
+    "min_cycle_recoil": 270,
+    "barrel_volume": "500 ml",
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
+    "valid_mod_locations": [
+      [ "barrel", 1 ],
+      [ "brass catcher", 1 ],
+      [ "grip", 1 ],
+      [ "mechanism", 2 ],
+      [ "muzzle", 1 ],
+      [ "sights", 1 ],
+      [ "sling", 1 ],
+      [ "stock mount", 1 ],
+      [ "stock accessory", 2 ],
+      [ "underbarrel", 1 ],
+      [ "rail mount", 1 ]
+    ],
+    "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "ppshmag", "ppshdrum" ] } ],
+    "melee_damage": { "bash": 10 }
+  },
+  {
+    "id": "ppshdrum",
+    "//": "Provisional. Audited by previous PR, longest_side with ImageJ.",
+    "looks_like": "mp5mag",
+    "type": "MAGAZINE",
+    "name": { "str": "PPSh 71-round drum magazine" },
+    "description": "A high-capacity drum magazine for the PPSh-41.",
+    "weight": "1760 g",
+    "volume": "911 ml",
+    "longest_side": "14 cm",
+    "price": "70 USD",
+    "price_postapoc": "5 USD",
+    "material": [ "steel" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "762x25" ],
+    "reload_time": 190,
+    "flags": [ "MAG_BULKY" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762x25": 71 } } ]
+  },
+  {
+    "id": "ppshmag",
+    "//": "Audited with ImageJ.",
+    "looks_like": "mp5mag",
+    "type": "MAGAZINE",
+    "name": { "str": "PPSh 35-round magazine" },
+    "description": "A 35-round box magazine for the PPSh-41.",
+    "weight": "312 g",
+    "volume": "184 ml",
+    "longest_side": "230 mm",
+    "price": "22 USD",
+    "price_postapoc": "2 USD 50 cent",
+    "material": [ "steel" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "762x25" ],
+    "flags": [ "MAG_COMPACT" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762x25": 35 } } ]
+  },
+  {
+    "id": "a180mag",
+    "looks_like": "mp5mag",
+    "type": "MAGAZINE",
+    "name": { "str": ".22 165-round magazine" },
+    "description": "An unusually-shaped pan magazine for use with .22 caliber submachine guns.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "a180mag",
+        "name": { "str": "American-180 165-round magazine" },
+        "description": "An unusually-shaped pan magazine for the American-180."
+      }
+    ],
+    "weight": "1039 g",
+    "volume": "892 ml",
+    "longest_side": "14 cm",
+    "price": "73 USD",
+    "price_postapoc": "2 USD 50 cent",
+    "material": [ "steel" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "22" ],
+    "reload_time": 150,
+    "flags": [ "MAG_BULKY" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 165 } } ]
+  },
+  {
+    "id": "a180mag1",
+    "looks_like": "mp5mag",
+    "type": "MAGAZINE",
+    "name": { "str": ".22 165-round polymer magazine" },
+    "description": "An unusually-shaped polymer constructed pan magazine for use with .22 caliber submachine guns.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "a180mag1",
+        "name": { "str": "American-180 polymer 165-round magazine" },
+        "description": "An unusually-shaped, polymer pan magazine for the American-180."
+      }
+    ],
+    "weight": "779 g",
+    "volume": "892 ml",
+    "longest_side": "14 cm",
+    "price": "73 USD",
+    "price_postapoc": "2 USD 50 cent",
+    "material": [ "plastic", "steel" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "22" ],
+    "reload_time": 150,
+    "flags": [ "MAG_BULKY" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 165 } } ]
+  },
+  {
+    "id": "a180mag2",
+    "looks_like": "mp5mag",
+    "type": "MAGAZINE",
+    "name": { "str": ".22 177-round magazine" },
+    "description": "An unusually-shaped pan magazine for use with .22 caliber submachine guns.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "a180mag2",
+        "name": { "str": "American-180 177-round magazine" },
+        "description": "An unusually-shaped pan magazine for the American-180."
+      }
+    ],
+    "weight": "1133 g",
+    "volume": "973 ml",
+    "longest_side": "15 cm",
+    "price": "75 USD",
+    "price_postapoc": "3 USD",
+    "material": [ "steel" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "22" ],
+    "reload_time": 150,
+    "flags": [ "MAG_BULKY" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 177 } } ]
+  },
+  {
+    "id": "a180mag3",
+    "looks_like": "mp5mag",
+    "type": "MAGAZINE",
+    "name": { "str": ".22 220-round polymer magazine" },
+    "description": "An unusually-shaped polymer pan magazine for use with .22 caliber submachine guns.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "a180mag3",
+        "name": { "str": "American-180 polymer 220-round magazine" },
+        "description": "An unusually-shaped polymer pan magazine for the American-180."
+      }
+    ],
+    "weight": "1258 g",
+    "volume": "1081 ml",
+    "longest_side": "16 cm",
+    "price": "80 USD",
+    "price_postapoc": "4 USD",
+    "material": [ "plastic", "steel" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "22" ],
+    "reload_time": 150,
+    "flags": [ "MAG_BULKY" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 220 } } ]
+  },
+  {
+    "id": "a180mag4",
+    "looks_like": "mp5mag",
+    "type": "MAGAZINE",
+    "name": { "str": ".22 275-round polymer magazine" },
+    "description": "An unusually-shaped polymer pan magazine for use with .22 caliber submachine guns.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "a180mag4",
+        "name": { "str": "American-180 polymer 275-round magazine" },
+        "description": "An unusually-shaped polymer pan magazine for the American-180."
+      }
+    ],
+    "weight": "1258 g",
+    "volume": "1081 ml",
+    "longest_side": "17 cm",
+    "price": "80 USD",
+    "price_postapoc": "4 USD",
+    "material": [ "plastic", "steel" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "22" ],
+    "reload_time": 150,
+    "flags": [ "MAG_BULKY" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 275 } } ]
+  },
+  {
+    "id": "american_180",
+    "looks_like": "hk_mp5",
+    "type": "GUN",
+    "reload_noise_volume": 10,
+    "name": { "str": ".22 caliber submachine gun" },
+    "description": "A dramatically uncommon automatic weapon, making use of high-capacity pan magazines and firing the low power .22 caliber cartridge: an unusual ammunition choice for a submachine gun.  With negligible recoil on account of its modest cartridge and a suppressively high rate of fire, a burst of .22 LR rounds from this little machine gun can be best likened with a swarm of hornets… an incredibly angry swarm of hornets.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "american_180",
+        "name": { "str": "American-180 submachine gun" },
+        "description": "The American-180 is a submachine gun developed in the 1960s that fires .22 LR, unusual for an SMG.  Though the round is low-powered, the high rate of fire and large magazine makes the 180 a formidable weapon."
+      }
+    ],
+    "weight": "2585 g",
+    "volume": "2200 ml",
+    "longest_side": "905 mm",
+    "barrel_length": "470 mm",
+    "price": "1 kUSD 630 USD",
+    "price_postapoc": "25 USD",
+    "to_hit": -2,
+    "material": [ "steel" ],
+    "symbol": "(",
+    "color": "light_gray",
+    "range": 6,
+    "ammo": [ "22" ],
+    "skill": "smg",
+    "ranged_damage": { "damage_type": "bullet", "amount": 4 },
+    "dispersion": 280,
+    "durability": 6,
+    "min_cycle_recoil": 39,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 6 ] ],
+    "barrel_volume": "250 ml",
+    "valid_mod_locations": [
+      [ "barrel", 1 ],
+      [ "brass catcher", 1 ],
+      [ "grip", 1 ],
+      [ "mechanism", 2 ],
+      [ "muzzle", 1 ],
+      [ "rail", 1 ],
+      [ "sights", 1 ],
+      [ "sling", 1 ],
+      [ "stock", 1 ],
+      [ "stock accessory", 2 ],
+      [ "underbarrel", 1 ]
+    ],
+    "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
+    "pocket_data": [
+      { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "a180mag", "a180mag1", "a180mag2", "a180mag3", "a180mag4" ] }
+    ],
+    "melee_damage": { "bash": 11 }
+  },
+  {
+    "id": "raging_judge",
+    "copy-from": "raging_bull",
+    "looks_like": "sw_619",
+    "type": "GUN",
+    "name": { "str_sp": "Taurus Raging Judge Magnum" },
+    "description": "The Taurus Raging Judge Magnum is a 6-shot revolver chambered in .454 Casull.  It can fire .410 shotshells and .45 Colt cartridges as well.",
+    "weight": "2070 g",
+    "volume": "1175 ml",
+    "longest_side": "385 mm",
+    "barrel_length": "241 mm",
+    "//": "165.1 + 76mm max OAL for .410 3in. Revolvers just built different.",
+    "clip_size": 6,
+    "pocket_data": [
+      {
+        "pocket_type": "MAGAZINE",
+        "holster": true,
+        "ammo_restriction": { "454": 6, "410shot": 6, "45colt": 6 },
+        "allowed_speedloaders": [ "454_speedloader6" ]
+      }
+    ]
+  },
+  {
+    "id": "454_speedloader6",
+    "copy-from": "454_speedloader5",
+    "type": "MAGAZINE",
+    "name": { "str": ".454 6-round speedloader" },
+    "description": "This speedloader can hold 5 rounds of .454, .45 Colt or .410 bore and quickly reload a compatible revolver.",
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "454": 6, "45colt": 6, "410shot": 6 } } ]
+  },
+  {
+    "id": "ksg-25",
+    "copy-from": "shotgun_pump",
+    "looks_like": "remington_870",
+    "type": "GUN",
+    "name": { "str": "extended bullpup shotgun" },
+    "description": "This pump-action shotgun uses a system of twin magazines to carry 24 total rounds of 12-gauge shotgun shells.  Each tube must be loaded separately, but this offers the option of loading different ammunition for different situations.  As the weapon's trigger is situated forwards of the chamber in what is termed as a 'bullpup' design, the firearm's still only as long as conventional shotguns despite having a comparatively far higher capacity.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "ksg-25",
+        "name": { "str": "Kel-Tec KSG-25 shotgun" },
+        "description": "A bullpup pump-action shotgun, the Kel-Tec KSG-25 uses a pair of magazine tubes to increase its capacity.  Each tube has to be loaded separately, but this offers the option of loading different ammunition for different situations.  The big brother of the KSG, it has a longer barrel and longer magazine tubes."
+      }
+    ],
+    "ascii_picture": "ksg-25",
+    "weight": "2100 g",
+    "volume": "4495 ml",
+    "longest_side": "971 mm",
+    "barrel_length": "775 mm",
+    "price": "1 kUSD 400 USD",
+    "price_postapoc": "40 USD",
+    "to_hit": -1,
+    "material": [ "steel", "plastic" ],
+    "ranged_damage": { "damage_type": "bullet", "amount": 1 },
+    "dispersion": 425,
+    "sight_dispersion": 500,
+    "durability": 7,
+    "clip_size": 12,
+    "built_in_mods": [ "ksg25_aux_shotgun" ],
+    "valid_mod_locations": [
+      [ "barrel", 1 ],
+      [ "brass catcher", 1 ],
+      [ "grip mount", 1 ],
+      [ "mechanism", 2 ],
+      [ "muzzle", 1 ],
+      [ "rail mount", 1 ],
+      [ "sights", 1 ],
+      [ "sling", 1 ],
+      [ "underbarrel", 2 ]
+    ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 12 } } ],
+    "melee_damage": { "bash": 9 }
+  },
+  {
+    "id": "ksg25_aux_shotgun",
+    "copy-from": "underbarrel_base",
+    "type": "GUNMOD",
+    "name": { "str": "KSG-25 second magazine" },
+    "description": "The integrated second tube magazine of the Kel-Tec KSG-25, which holds 12 shots.  It's irremovable.",
+    "weight": "1550 g",
+    "volume": "1750 ml",
+    "price": "0 cent",
+    "price_postapoc": "0 cent",
+    "install_time": "0 s",
+    "material": [ "steel" ],
+    "symbol": ":",
+    "color": "light_red",
+    "location": "underbarrel",
+    "mod_targets": [ "shotgun" ],
+    "gun_data": {
+      "barrel_length": "775 mm",
+      "ammo": "shot",
+      "skill": "shotgun",
+      "ranged_damage": { "damage_type": "bullet", "amount": 5 },
+      "dispersion": 425,
+      "durability": 7,
+      "clip_size": 12,
+      "reload": 120
+    },
+    "flags": [ "RELOAD_ONE", "IRREMOVABLE" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "shot": 12 } } ]
+  }
+]
diff --git a/data/mods/BombasticPerks/perkdata/old_guns.json b/data/mods/BombasticPerks/perkdata/old_guns.json
index 45df01214e5f3..3bff54ec2ba86 100644
--- a/data/mods/BombasticPerks/perkdata/old_guns.json
+++ b/data/mods/BombasticPerks/perkdata/old_guns.json
@@ -223,13 +223,6 @@
     "name": { "str": "6-round trenchgun" },
     "extend": { "flags": [ "OLD_GUN" ] }
   },
-  {
-    "id": "ppsh",
-    "type": "GUN",
-    "copy-from": "ppsh",
-    "name": { "str": "PPSh-41 submachine gun" },
-    "extend": { "flags": [ "OLD_GUN" ] }
-  },
   {
     "id": "number4_mki",
     "type": "GUN",
diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
index 7b37b00f5f2c7..1fae30d7d0b01 100644
--- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
+++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
@@ -71,7 +71,7 @@
     "replace": "pistol_magnum_pipe"
   },
   {
-    "id": [ "sw_619", "mr73", "sw629", "bfr", "sw_500", "raging_bull", "raging_judge" ],
+    "id": [ "sw_619", "mr73", "sw629", "bfr", "sw_500", "raging_bull" ],
     "type": "MIGRATION",
     "replace": "pistol_magnum_revolver"
   },
@@ -158,7 +158,6 @@
   },
   {
     "id": [
-      "ppsh",
       "hk_mp5",
       "hk_mp5sd",
       "uzi",
@@ -181,7 +180,7 @@
     "replace": "pistol_smg"
   },
   {
-    "id": [ "american_180", "ruger_1022", "ruger_1022_auto", "ruger_charger_auto" ],
+    "id": [ "ruger_1022", "ruger_1022_auto", "ruger_charger_auto" ],
     "type": "MIGRATION",
     "replace": "pistol_tiny_rifle"
   },
@@ -410,7 +409,6 @@
       "rm120c",
       "rm228",
       "rm20",
-      "bigun",
       "saiga_12",
       "afs_raketa_shotgun",
       "tavor_12",
@@ -427,7 +425,6 @@
       "shotgun_410",
       "benelli_sa",
       "ksg",
-      "ksg-25",
       "mossberg_500",
       "mossberg_590",
       "mossberg_930",
diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json b/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json
index e309e87f90e53..e410cfa3173bc 100644
--- a/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json
+++ b/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json
@@ -2,6 +2,17 @@
   {
     "type": "ITEM_BLACKLIST",
     "whitelist": false,
-    "items": [ "m74_clip", "exodiisapramag5", "robofac_gun_40mm_10rd", "robofac_gun_40mm_5rd", "robofac_gun_40mm_3rd" ]
+    "items": [
+      "m74_clip",
+      "exodiisapramag5",
+      "robofac_gun_40mm_10rd",
+      "robofac_gun_40mm_5rd",
+      "robofac_gun_40mm_3rd",
+      "a180mag",
+      "a180mag1",
+      "a180mag2",
+      "a180mag3",
+      "a180mag4"
+    ]
   }
 ]
diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json
index 8cf856d7c61e3..fa17eba602951 100644
--- a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json
+++ b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json
@@ -188,7 +188,6 @@
       "40_speedloader6",
       "44_speedloader6",
       "454_speedloader5",
-      "454_speedloader6",
       "460_speedloader6",
       "500_speedloader5",
       "8x40_speedloader5",
@@ -200,14 +199,11 @@
   },
   {
     "id": [
-      "a180mag",
-      "a180mag1",
-      "a180mag2",
-      "a180mag3",
-      "a180mag4",
       "mosquitomag",
       "ruger1022bigmag",
       "ruger1022mag",
+      "sw22mag",
+      "j22mag",
       "wp22mag",
       "kp32mag",
       "cp33_mag",
diff --git a/data/mods/TEST_DATA/item_demographics.json b/data/mods/TEST_DATA/item_demographics.json
index 1a0a42e6e6225..a55bb7dc5fc38 100644
--- a/data/mods/TEST_DATA/item_demographics.json
+++ b/data/mods/TEST_DATA/item_demographics.json
@@ -792,7 +792,6 @@
             "bigun": 1,
             "lever_shotgun": 1,
             "ksg": 1,
-            "ksg-25": 1,
             "mossberg_500": 1,
             "mossberg_500_security": 1,
             "mossberg_590": 1,
@@ -1021,7 +1020,6 @@
             "px4": 1,
             "px4_40": 1,
             "raging_bull": 1,
-            "raging_judge": 1,
             "remington_870_breacher": 1,
             "rm103a_pistol": 1,
             "rm228": 1,
@@ -1247,8 +1245,6 @@
             "bigun": 1,
             "combination_gun_shotgun": 1,
             "ksg": 1,
-            "ksg-25": 1,
-            "ksg25_aux_shotgun": 1,
             "ksg_aux_shotgun": 1,
             "lever_shotgun": 1,
             "m26_mass": 1,
diff --git a/data/mods/Xedra_Evolved/recipes/inventor/gun.json b/data/mods/Xedra_Evolved/recipes/inventor/gun.json
index 2418d1eff73e7..bc6b5c8595900 100644
--- a/data/mods/Xedra_Evolved/recipes/inventor/gun.json
+++ b/data/mods/Xedra_Evolved/recipes/inventor/gun.json
@@ -359,7 +359,6 @@
         [ "remington_870", 1 ],
         [ "remington_870_express", 1 ],
         [ "ksg", 1 ],
-        [ "ksg-25", 1 ],
         [ "saiga_12", 1 ],
         [ "tavor_12", 1 ],
         [ "winchester_1897", 1 ]
diff --git a/tests/ranged_balance_test.cpp b/tests/ranged_balance_test.cpp
index 6afc3f84ca172..2d624603d5d87 100644
--- a/tests/ranged_balance_test.cpp
+++ b/tests/ranged_balance_test.cpp
@@ -354,7 +354,7 @@ TEST_CASE( "expert_shooter_accuracy", "[ranged] [balance]" )
         test_fast_shooting( shooter, 60, 0.5 );
     }
     SECTION( "an expert shooter with an excellent smg" ) {
-        arm_shooter( shooter, "ppsh", { "holo_sight" } );
+        arm_shooter( shooter, "fn_p90", { "holo_sight" } );
         test_shooting_scenario( shooter, 20, 30, 190 );
         test_fast_shooting( shooter, 60, 0.5 );
     }
diff --git a/tools/json_tools/generic_guns_validator.py b/tools/json_tools/generic_guns_validator.py
index 4c7be5268f89c..6c1ede54ef091 100755
--- a/tools/json_tools/generic_guns_validator.py
+++ b/tools/json_tools/generic_guns_validator.py
@@ -53,7 +53,17 @@
     'l_bak_223',
     'pneumatic_shotgun',
     'rifle_223',
+    'ksg-25',
+    'raging_judge',
+    'american_180',
+    'ppsh',
     # Magazines
+    'a180mag',
+    'a180mag1',
+    'a180mag2',
+    'a180mag3',
+    'a180mag4',
+    '454_speedloader6',
     '223_speedloader5',
     'coin_wrapper',
     'exodiisapramag5',
@@ -62,7 +72,6 @@
     'robofac_gun_40mm_10rd',
     'bio_shotgun_gun',
     'gasfilter_med',
-
     'gasfilter_sm',
     'matchhead_30carbine',
     'matchhead_30carbine_jsp',