diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml
index 8492908a15..643d2b3922 100644
--- a/Resources/Prototypes/Catalog/Research/technologies.yml
+++ b/Resources/Prototypes/Catalog/Research/technologies.yml
@@ -144,59 +144,8 @@
 
 # Security Technology Tree
 
-- type: technology
-  name: "security technology"
-  id: SecurityTechnology
-  description: Beginning of the long hard road to exosuits.
-  icon:
-    sprite: Objects/Weapons/Melee/stunbaton.rsi
-    state: stunbaton_off
-  requiredPoints: 10000
-  requiredTechnologies:
-    - BasicResearch
-  unlockedRecipes:
-    - Flash
-    - Handcuffs
-    - Stunbaton
-    - RiotShield
-    - FlashPayload
-
-- type: technology
-  name: "non-lethal technology"
-  id: NonLethalTechnology
-  description: For the softer approach to detaining.
-  icon:
-    sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
-    state: beanbag
-  requiredPoints: 8000
-  requiredTechnologies:
-     - SecurityTechnology
-  unlockedRecipes:
-    - ShellShotgunBeanbag
-    - ShellTranquilizer
-    - ShellShotgunFlash
-    - CartridgePistolRubber
-    - CartridgeMagnumRubber
-    - CartridgeCaselessRifleRubber
-    - CartridgeLightRifleRubber
-    - CartridgeRifleRubber
-
-- type: technology
-  name: "ballistic technology"
-  id: BallisticTechnology
-  description: Just a fancy term for guns.
-  icon:
-    sprite: Objects/Weapons/Guns/Pistols/mk58.rsi
-    state: icon
-  requiredPoints: 15000
-  requiredTechnologies:
-     - SecurityTechnology
-  unlockedRecipes:
-    - CartridgePistol
-    - ShellShotgun
-    - ShellShotgunFlare
-    - CartridgeLightRifle
-    - CartridgeMagnum
+# Empty, as all the security tech is now available
+# roundstart in the security techfab.
 
 #- type: technology
 #   name: "ballistic technology"
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 1c7fbfa064..13f26b21e7 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -300,41 +300,25 @@
   - type: LatheVisuals
     idleState: icon
     runningState: icon
-  - type: ProtolatheDatabase
-    protolatherecipes:
+  - type: LatheDatabase
+    static: true
+    recipes:
       - Flash
+      - FlashPayload
       - Handcuffs
       - Stunbaton
       - RiotShield
       - CartridgePistol
-      - ShellShotgun
-      - CartridgeLightRifle
       - CartridgeMagnum
-      - ShellShotgunBeanbag
-      - ShellShotgunFlare
-      - ShellShotgunFlash
       - CartridgePistolRubber
       - CartridgeMagnumRubber
+      - ShellShotgun
+      - ShellShotgunBeanbag
+      - ShellShotgunFlare
+      - CartridgeLightRifle
       - CartridgeCaselessRifleRubber
       - CartridgeLightRifleRubber
-      - CartridgeRifleRubber  #Everything below this is shared with other lathes
-      - FlashlightLantern
-      - Bucket
-      - MopItem
-      - SprayBottle
-      - FireExtinguisher
-      - LightTube
-      - LightBulb
-      - SheetSteel
-      - SheetGlass1
-      - SheetRGlass
-      - SheetPlastic
-      - CableStack
-      - CableMVStack
-      - CableHVStack
-      - TimerTrigger
-      - Signaller
-      - SignalTrigger
+      - CartridgeRifleRubber
   - type: Machine
     board: SecurityTechFabCircuitboard
   - type: Lathe
@@ -367,8 +351,9 @@
   - type: LatheVisuals
     idleState: icon
     runningState: icon
-  - type: ProtolatheDatabase
-    protolatherecipes:
+  - type: LatheDatabase
+    static: true
+    recipes:
       - HandheldHealthAnalyzer
       - ClothingHandsGlovesLatex
       - ClothingHandsGlovesNitrile
@@ -387,21 +372,7 @@
       - CryostasisBeaker
       - Dropper
       - Syringe
-      - PillCanister #Everything below this is shared with other lathes
-      - FlashlightLantern
-      - Bucket
-      - MopItem
-      - SprayBottle
-      - FireExtinguisher
-      - LightTube
-      - LightBulb
-      - SheetSteel
-      - SheetGlass1
-      - SheetRGlass
-      - SheetPlastic
-      - CableStack
-      - CableMVStack
-      - CableHVStack
+      - PillCanister
   - type: Machine
     board: MedicalTechFabCircuitboard