diff --git a/data/mods/Aftershock/items/furniture.json b/data/mods/Aftershock/items/furniture.json
index e9e25f27133ae..f149956587633 100644
--- a/data/mods/Aftershock/items/furniture.json
+++ b/data/mods/Aftershock/items/furniture.json
@@ -52,31 +52,5 @@
         { "item": "scrap", "count": [ 10, 20 ] }
       ]
     }
-  },
-  {
-    "type": "furniture",
-    "id": "f_nano_forge",
-    "name": "deployed nano forge rig",
-    "description": "Matrioshka Fabritechnics nano forge looks like a solid black box.  Apertures for ingredients open with a hum as the console commands are entered.  DO NOT INSERT ANY PART OF YOUR ANATOMY.",
-    "symbol": "H",
-    "color": "light_cyan",
-    "crafting_pseudo_item": "nano_pseudo_forge",
-    "move_cost_mod": -1,
-    "coverage": 70,
-    "required_str": -1,
-    "flags": [ "NOITEM", "SEALED", "ALLOW_FIELD_EFFECT", "TRANSPARENT", "EASY_DECONSTRUCT", "CONTAINER", "LIQUIDCONT" ],
-    "deconstruct": { "items": [ { "item": "nano_forge", "count": 1 } ] },
-    "bash": {
-      "str_min": 12,
-      "str_max": 50,
-      "sound": "smash!",
-      "sound_fail": "whump.",
-      "items": [
-        { "item": "plastic_chunk", "count": [ 6, 8 ] },
-        { "item": "water_faucet", "prob": 50 },
-        { "item": "sheet_metal_small", "count": [ 6, 12 ] },
-        { "item": "scrap", "count": [ 10, 20 ] }
-      ]
-    }
   }
 ]
diff --git a/data/mods/Aftershock/maps/furniture.json b/data/mods/Aftershock/maps/furniture.json
index e004552de6ef0..62e7bcd820f90 100644
--- a/data/mods/Aftershock/maps/furniture.json
+++ b/data/mods/Aftershock/maps/furniture.json
@@ -344,7 +344,7 @@
     "id": "f_nano_forge",
     "name": "nano forge",
     "looks_like": "f_forge",
-    "description": "Matrioshka Fabritechnics created this portable nanotech forge for when expeditions are setting up a basecamp far from population centers.  Once deployed it can be used to craft ultratech marvels that otherwise are too minute for human crafting.  Often used in combination with a diamond press.",
+    "description": "Matrioshka Fabritechnics nano forge looks like a solid black box.  Apertures for ingredients open with a hum as the console commands are entered.  DO NOT INSERT ANY PART OF YOUR ANATOMY.",
     "symbol": "*",
     "color": "light_gray",
     "move_cost_mod": -1,
diff --git a/data/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json b/data/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json
index 1bc58ca235183..3fa91764bb0ae 100644
--- a/data/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json
+++ b/data/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json
@@ -227,18 +227,6 @@
     "types": [ "BACKGROUND_SURVIVAL_STORY" ],
     "flags": [ "BG_SURVIVAL_STORY" ]
   },
-  {
-    "type": "mutation",
-    "id": "BGSS_CYBERNINJA",
-    "name": { "str": "Whately Story" },
-    "points": 0,
-    "description": "This NPC could tell you about how they survived the Cataclysm",
-    "player_display": false,
-    "valid": false,
-    "purifiable": false,
-    "types": [ "BACKGROUND_SURVIVAL_STORY" ],
-    "flags": [ "BG_SURVIVAL_STORY" ]
-  },
   {
     "type": "mutation",
     "//": "This is a unique background story trait that should not be given out randomly.",