diff --git a/Resources/Locale/en-US/deltav/job/department-desc.ftl b/Resources/Locale/en-US/deltav/job/department-desc.ftl
index 5f5ad17c723..4e19e50c340 100644
--- a/Resources/Locale/en-US/deltav/job/department-desc.ftl
+++ b/Resources/Locale/en-US/deltav/job/department-desc.ftl
@@ -1,3 +1,3 @@
 department-Epistemics-description = Research artifacts and anomalies to invent new equipment for the station, while trying to keep glimmer tame.
-department-Logistics-description = Complete bounties, earn Spesos, and deliver useful supplies to the crew.
+department-Logistics-description = Complete bounties, earn Spesos and deliver useful supplies to the crew.
 department-Justice-description = Uphold justice on the station.
diff --git a/Resources/Locale/en-US/deltav/job/job-names.ftl b/Resources/Locale/en-US/deltav/job/job-names.ftl
index f0433bad8a8..5d810eac7ed 100644
--- a/Resources/Locale/en-US/deltav/job/job-names.ftl
+++ b/Resources/Locale/en-US/deltav/job/job-names.ftl
@@ -33,7 +33,7 @@ job-name-prospector = Prospector
 job-name-excavator = Excavator
 job-name-lab-tech = Lab Technician
 job-name-xenoarch = Xenoarchaeologist
-job-name-roboticist = Roboticist
+#job-name-roboticist = Roboticist
 job-name-jester = Jester
 job-name-fool = Fool
 
diff --git a/Resources/Locale/en-US/nyanotrasen/job/job-description.ftl b/Resources/Locale/en-US/nyanotrasen/job/job-description.ftl
index 3b9bc86e6f8..08fc8bd1629 100644
--- a/Resources/Locale/en-US/nyanotrasen/job/job-description.ftl
+++ b/Resources/Locale/en-US/nyanotrasen/job/job-description.ftl
@@ -1,6 +1,5 @@
 job-description-gladiator = Put on a combat spectacle for the crew. Fight for your freedom, glory, and honor. Currently available on Arena.
 job-description-guard = Keep track of prisoners and make sure they have their basic needs.
-job-description-mail-carrier = Deliver mail and other packages from and to logistics. Avoid dogs.
 job-description-martialartist = Be honorable and disciplined, spar in the dojo, challenge security to CQC. Currently available on Shōkō.
 job-description-prisoner = Sit in prison. Gamble with your cellmates. Talk to the warden. Write your memoirs.
 job-description-mantis = Solve mysteries from the nature of the universe to the meaning of life. Be the main person to deal with Psionic beings.
diff --git a/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl b/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl
index 3ade7056a48..bcd05861c42 100644
--- a/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl
+++ b/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl
@@ -1,8 +1,7 @@
 job-name-gladiator = Gladiator
 job-name-guard = Prison Guard
-job-name-mail-carrier = Mail Carrier
 job-name-martialartist =  Martial Artist
-job-name-prisoner = Prisoner
+#job-name-prisoner = Prisoner
 job-name-mantis = Psionic Mantis
 
 # Role timers
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/misc.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/misc.yml
deleted file mode 100644
index f97a5be4c4e..00000000000
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/misc.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- type: entity
-  id: ClothingShoesBootsJackFilled
-  parent: ClothingShoesBootsJack
-  suffix: Filled
-  components:
-  - type: ContainerFill
-    containers:
-      item:
-      - CombatKnife
diff --git a/Resources/Prototypes/DeltaV/StatusIcon/job.yml b/Resources/Prototypes/DeltaV/StatusIcon/job.yml
index 243b6ffc476..fef4f4489a0 100644
--- a/Resources/Prototypes/DeltaV/StatusIcon/job.yml
+++ b/Resources/Prototypes/DeltaV/StatusIcon/job.yml
@@ -1,4 +1,4 @@
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconMedicalBorg
   icon:
@@ -6,7 +6,15 @@
     state: MedicalBorg
   jobName: job-name-medical-borg
 
-- type: statusIcon
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconCourier
+  icon:
+    sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
+    state: nyanoMailCarrier
+  jobName: job-name-courier
+
+- type: jobIcon
   parent: JobIcon
   id: JobIconChiefJustice
   icon:
@@ -14,7 +22,7 @@
     state: ChiefJustice
   jobName: job-name-chief-justice
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconClerk
   icon:
@@ -22,7 +30,7 @@
     state: Clerk
   jobName: job-name-clerk
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconProsecutor
   icon:
@@ -30,7 +38,7 @@
     state: Prosecutor
   jobName: job-name-prosecutor
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconSecurityBorg
   icon:
diff --git a/Resources/Prototypes/DeltaV/StatusIcon/security.yml b/Resources/Prototypes/DeltaV/StatusIcon/security.yml
index 71d4edd9f13..ce8f3763f6e 100644
--- a/Resources/Prototypes/DeltaV/StatusIcon/security.yml
+++ b/Resources/Prototypes/DeltaV/StatusIcon/security.yml
@@ -1,4 +1,5 @@
-- type: statusIcon # DeltaV - HUD state for crew subpeonaed by Justice Dept. 
+# HUD state for crew subpeonaed by Justice Dept.
+- type: securityIcon
   parent: SecurityIcon
   id: SecurityIconSubpoenaed
   icon:
diff --git a/Resources/Prototypes/DeltaV/status_effects.yml b/Resources/Prototypes/DeltaV/status_effects.yml
index c837b6b0d34..e69de29bb2d 100644
--- a/Resources/Prototypes/DeltaV/status_effects.yml
+++ b/Resources/Prototypes/DeltaV/status_effects.yml
@@ -1,6 +0,0 @@
-- type: statusIcon
-  parent: JobIcon
-  id: JobIconCourier
-  icon:
-    sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
-    state: nyanoMailCarrier
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml
deleted file mode 100644
index d84011280f5..00000000000
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml
+++ /dev/null
@@ -1,85 +0,0 @@
-- type: entity
-  id: ShuttleGunSvalinnMachineGunCircuitboard
-  parent: BaseMachineCircuitboard
-  name: LSE-400c "Svalinn machine gun" machine board
-  description: A machine printed circuit board for an LSE-400c "Svalinn machine gun".
-  suffix: DO NOT MAP, Machine Board
-  components:
-  - type: Sprite
-    state: security
-  - type: MachineBoard
-    prototype: ShuttleGunSvalinnMachineGun
-    stackRequirements:
-      MatterBin: 2
-      Manipulator: 4
-      Steel: 5
-      CableHV: 5
-
-- type: entity
-  id: ShuttleGunPerforatorCircuitboard
-  parent: BaseMachineCircuitboard
-  name: LSE-1200c "Perforator" machine board
-  description: A machine printed circuit board for an LSE-1200c "Perforator".
-  suffix: DO NOT MAP, Machine Board
-  components:
-  - type: Sprite
-    state: security
-  - type: MachineBoard
-    prototype: ShuttleGunPerforator
-    stackRequirements:
-      MatterBin: 4
-      Manipulator: 6
-      Steel: 10
-      CableHV: 5
-
-- type: entity
-  id: ShuttleGunFriendshipCircuitboard
-  parent: BaseMachineCircuitboard
-  name: EXP-320g "Friendship" machine board
-  description: A machine printed circuit board for an EXP-320g "Friendship".
-  suffix: DO NOT MAP, Machine Board
-  components:
-  - type: Sprite
-    state: security
-  - type: MachineBoard
-    prototype: ShuttleGunFriendship
-    stackRequirements:
-      MatterBin: 3
-      Manipulator: 2
-      Steel: 7
-      CableHV: 5
-
-- type: entity
-  id: ShuttleGunDusterCircuitboard
-  parent: BaseMachineCircuitboard
-  name: EXP-2100g "Duster" machine board
-  description: A machine printed circuit board for an EXP-2100g "Duster".
-  suffix: DO NOT MAP, Machine Board
-  components:
-  - type: Sprite
-    state: security
-  - type: MachineBoard
-    prototype: ShuttleGunDuster
-    stackRequirements:
-      MatterBin: 6
-      Manipulator: 4
-      Steel: 10
-      CableHV: 5
-      Uranium: 2
-
-- type: entity
-  id: ShuttleGunKineticCircuitboard
-  parent: BaseMachineCircuitboard
-  name: PTK-800 "Matter Dematerializer" machine board
-  description: A machine printed circuit board for an PTK-800 "Matter Dematerializer".
-  suffix: DO NOT MAP, Machine Board
-  components:
-  - type: Sprite
-    state: security
-  - type: MachineBoard
-    prototype: ShuttleGunKinetic
-    stackRequirements:
-      MatterBin: 2
-      Manipulator: 3
-      Steel: 5
-      CableHV: 2
diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
index be8f166f358..bfd66a917ba 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
@@ -103,15 +103,6 @@
   equipment:
     outerClothing: ClothingOuterCoatRnd
 
-- type: loadout # DeltaV
-  id: RoboticistLabCoat
-  equipment: RoboticistLabCoat
-
-- type: startingGear # DeltaV
-  id: RoboticistLabCoat
-  equipment:
-    outerClothing: ClothingOuterCoatRobo
-
 - type: loadout
   id: ScienceWintercoat
   equipment:
diff --git a/Resources/Prototypes/Nyanotrasen/StatusIcon/job.yml b/Resources/Prototypes/Nyanotrasen/StatusIcon/job.yml
index a599992d57f..c4b0c0bc04d 100644
--- a/Resources/Prototypes/Nyanotrasen/StatusIcon/job.yml
+++ b/Resources/Prototypes/Nyanotrasen/StatusIcon/job.yml
@@ -1,4 +1,4 @@
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconGladiator
   icon:
@@ -6,7 +6,7 @@
     state: nyanoGladiator
   name: job-name-gladiator
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconPrisonGuard
   icon:
@@ -14,15 +14,7 @@
     state: nyanoPrisonGuard
   name: job-name-prison-guard
 
-- type: statusIcon
-  parent: JobIcon
-  id: JobIconMailCarrier
-  icon:
-    sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
-    state: nyanoMailCarrier
-  name: job-name-courier
-
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconMartialArtist
   icon:
@@ -30,7 +22,7 @@
     state: nyanoMartialArtist
   name: job-name-martialartist
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconForensicMantis
   icon:
diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml
index 1a411514f3a..311e5b5c094 100644
--- a/Resources/Prototypes/Roles/Antags/nukeops.yml
+++ b/Resources/Prototypes/Roles/Antags/nukeops.yml
@@ -50,7 +50,6 @@
     time: 36000 # DeltaV - 10 hours
   - !type:WhitelistRequirement # DeltaV - Whitelist requirement
   # should be changed to nukie playtime when thats tracked (wyci)
-  guides: [ NuclearOperatives ]
 
 - type: startingGear
   id: SyndicateOperativeGearFullNoUplink