diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
index 3784d4d7bbf6b..879c86d2ed818 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -321,9 +321,7 @@
     "id": "guns_pistol_improvised",
     "//": "Makeshift or otherwise poor quality pistols.",
     "items": [
-      { "item": "ashot", "prob": 100 },
-      { "item": "surv_hand_cannon", "prob": 100, "charges-min": 0, "charges-max": 5 },
-      { "item": "surv_six_shooter", "prob": 100, "charges-min": 0, "charges-max": 6 }
+      { "item": "ashot", "prob": 100 }
     ]
   },
   {
diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json
index 65aac94ae19a0..3b30336cf730e 100644
--- a/data/json/items/gun/40.json
+++ b/data/json/items/gun/40.json
@@ -172,46 +172,6 @@
     "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "smg_40_mag" ] } ],
     "melee_damage": { "bash": 10 }
   },
-  {
-    "id": "surv_six_shooter",
-    "looks_like": "sw_619",
-    "type": "GUN",
-    "reload_noise_volume": 10,
-    "name": { "str": "handmade six-shooter" },
-    "description": "A homemade 6-shot revolver.  While it's not as good as the pre-Cataclysm manufactured weapons, it's a decent piece of work, all things considered.",
-    "weight": "1333 g",
-    "volume": "750 ml",
-    "longest_side": "33 cm",
-    "barrel_length": "127 mm",
-    "price": 15000,
-    "price_postapoc": 750,
-    "to_hit": -2,
-    "material": [ "steel" ],
-    "symbol": "(",
-    "color": "dark_gray",
-    "ammo": [ "40" ],
-    "skill": "pistol",
-    "ranged_damage": { "damage_type": "bullet", "amount": -1 },
-    "dispersion": 620,
-    "durability": 6,
-    "blackpowder_tolerance": 60,
-    "loudness": 25,
-    "clip_size": 6,
-    "reload": 200,
-    "valid_mod_locations": [
-      [ "barrel", 1 ],
-      [ "bore", 1 ],
-      [ "grip", 1 ],
-      [ "sights", 1 ],
-      [ "stock", 1 ],
-      [ "underbarrel", 1 ],
-      [ "rail mount", 1 ]
-    ],
-    "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
-    "flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "40": 6 } } ],
-    "melee_damage": { "bash": 8 }
-  },
   {
     "id": "hi_power_40",
     "copy-from": "pistol_base",
diff --git a/data/json/items/gun/45.json b/data/json/items/gun/45.json
index b4a068ac1f2f5..8ad21e5b30fb6 100644
--- a/data/json/items/gun/45.json
+++ b/data/json/items/gun/45.json
@@ -275,34 +275,6 @@
     "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "smg_45_mag", "mac10mag" ] } ],
     "melee_damage": { "bash": 10 }
   },
-  {
-    "id": "surv_hand_cannon",
-    "copy-from": "pistol_revolver",
-    "looks_like": "sw_619",
-    "type": "GUN",
-    "name": { "str": "homemade hand cannon" },
-    "//": "On one hand, it's very big for a handgun. On the other, it's still a scrap weapon.",
-    "description": "A large and heavy pistol evidently welded from scrap.  It's not pretty, but the .45 it's chambered with packs a serious punch.  Just watch out for the kick.",
-    "weight": "1200 g",
-    "volume": "1 L",
-    "longest_side": "30 cm",
-    "barrel_length": "156 mm",
-    "price": 60000,
-    "price_postapoc": 750,
-    "to_hit": -3,
-    "material": [ "steel" ],
-    "symbol": "(",
-    "color": "dark_gray",
-    "ammo": [ "45" ],
-    "ranged_damage": { "damage_type": "bullet", "amount": -2 },
-    "dispersion": 620,
-    "durability": 7,
-    "blackpowder_tolerance": 60,
-    "loudness": 25,
-    "clip_size": 5,
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "45": 5 } } ],
-    "melee_damage": { "bash": 12 }
-  },
   {
     "id": "tommygun",
     "looks_like": "hk_mp5",
diff --git a/data/json/obsoletion_and_migration_0.I/migration_items.json b/data/json/obsoletion_and_migration_0.I/migration_items.json
index 59a9861bd6064..b91d0c25d987b 100644
--- a/data/json/obsoletion_and_migration_0.I/migration_items.json
+++ b/data/json/obsoletion_and_migration_0.I/migration_items.json
@@ -1221,5 +1221,15 @@
     "id": "riv_suppressor",
     "type": "MIGRATION",
     "replace": "suppressor"
+  },
+  {
+    "id": "surv_six_shooter",
+    "type": "MIGRATION",
+    "replace": "sw_619"
+  },
+  {
+    "id": "surv_hand_cannon",
+    "type": "MIGRATION",
+    "replace": "sw_619"
   }
 ]
diff --git a/data/json/recipes/weapon/ranged.json b/data/json/recipes/weapon/ranged.json
index 46cc627bac24e..0a959f2e89e72 100644
--- a/data/json/recipes/weapon/ranged.json
+++ b/data/json/recipes/weapon/ranged.json
@@ -743,50 +743,6 @@
       [ [ "steel_chunk", 3 ], [ "scrap", 9 ] ]
     ]
   },
-  {
-    "type": "recipe",
-    "activity_level": "MODERATE_EXERCISE",
-    "result": "surv_six_shooter",
-    "category": "CC_WEAPON",
-    "subcategory": "CSC_WEAPON_RANGED",
-    "skill_used": "fabrication",
-    "skills_required": [ [ "traps", 2 ], [ "gun", 3 ] ],
-    "difficulty": 4,
-    "time": "8 h",
-    "book_learn": [ [ "manual_pistol", 3 ] ],
-    "qualities": [ { "id": "SAW_M_FINE", "level": 1 } ],
-    "//": "60cm weld",
-    "using": [ [ "welding_standard", 60 ] ],
-    "proficiencies": [
-      { "proficiency": "prof_metalworking" },
-      { "proficiency": "prof_welding_basic" },
-      { "proficiency": "prof_gunsmithing_basic" },
-      { "proficiency": "prof_gunsmithing_revolver" }
-    ],
-    "components": [ [ [ "pipe", 1 ] ], [ [ "spring", 1 ] ], [ [ "steel_chunk", 2 ] ], [ [ "scrap", 2 ] ] ]
-  },
-  {
-    "type": "recipe",
-    "activity_level": "MODERATE_EXERCISE",
-    "result": "surv_hand_cannon",
-    "category": "CC_WEAPON",
-    "subcategory": "CSC_WEAPON_RANGED",
-    "skill_used": "fabrication",
-    "skills_required": [ [ "traps", 2 ], [ "gun", 4 ] ],
-    "difficulty": 5,
-    "time": "8 h",
-    "book_learn": [ [ "manual_pistol", 5 ] ],
-    "qualities": [ { "id": "SAW_M_FINE", "level": 1 } ],
-    "//": "60cm weld",
-    "using": [ [ "welding_standard", 60 ] ],
-    "proficiencies": [
-      { "proficiency": "prof_metalworking" },
-      { "proficiency": "prof_welding_basic" },
-      { "proficiency": "prof_gunsmithing_basic" },
-      { "proficiency": "prof_gunsmithing_revolver" }
-    ],
-    "components": [ [ [ "pipe", 1 ] ], [ [ "spring", 1 ] ], [ [ "steel_chunk", 2 ] ], [ [ "scrap", 2 ] ] ]
-  },
   {
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",