diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/backpack.yml
index 400445fc23c..d72e0dd7cd8 100644
--- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -6,9 +6,7 @@
     - type: StorageFill
       contents:
       - id: BoxSurvival
-      # DeltaV - Mantis is no longer a Detective - Comment out BoxForensicPad
-      # - id: BoxForensicPad
-      # End of modified code
+      # - id: BoxForensicPad # DeltaV - Mantis is no longer a Detective
       - id: HandLabeler
       - id: PillMindbreakerToxin
       - id: BoxFolderGrey
diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
index 8e875270529..982b820ad10 100644
--- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
+++ b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -6,9 +6,7 @@
     - type: StorageFill
       contents:
       - id: BoxSurvival
-      # DeltaV - Mantis is no longer a Detective - Comment out BoxForensicPad
-      # - id: BoxForensicPad
-      # End of modified code
+      # - id: BoxForensicPad # DeltaV - Mantis is no longer a Detective
       - id: HandLabeler
       - id: PillMindbreakerToxin
       - id: BoxFolderGrey
diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/satchel.yml
index 8dea08f07a8..5644f36c9ce 100644
--- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/satchel.yml
+++ b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -6,9 +6,7 @@
     - type: StorageFill
       contents:
       - id: BoxSurvival
-      # DeltaV - Mantis is no longer a Detective - Comment out BoxForensicPad
-      # - id: BoxForensicPad
-      # End of modified code
+      # - id: BoxForensicPad # DeltaV - Mantis is no longer a Detective
       - id: HandLabeler
       - id: PillMindbreakerToxin
       - id: BoxFolderGrey
diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Lockers/epistemics.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Lockers/epistemics.yml
index 88ada56899f..6fa1145175b 100644
--- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Lockers/epistemics.yml
+++ b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Lockers/epistemics.yml
@@ -6,30 +6,24 @@
   - type: StorageFill
     contents:
       # Tools
-      # DeltaV - Mantis is no longer a Detective - Remove items that were for the Detective and give them some replacements
-      # - id: FlashlightSeclite
+      # - id: FlashlightSeclite # Deltav - Detective is in charge of investigating crimes.
       # - id: ForensicScanner
       # - id: BoxForensicPad
-      # - id: ClothingHandsGlovesForensic
-      - id: FlashlightLantern
-      - id: BoxZiptie
-      # End of modified code
       - id: AntiPsychicKnife
+      - id: FlashlightLantern # DeltaV - To replace their lost flashlight
+      - id: BoxZiptie # DeltaV - Give the mantis some zipties
+      - id: WeaponPistolPsiBreaker # DeltaV - Mantis mindbreaker pistol, see Resources/Prototypes/DeltaV/Entities?Objects/Weapons/Guns/Pistols/pistols.yml
       # Spare change of clothes
-      # DeltaV - Mantis Clothes Removal - Remove the Psionic Mantis spares clothes to mimic the detective closet
       # - id: ClothingUniformJumpsuitMantis
       # - id: ClothingUniformSkirtMantis
       # - id: ClothingBeltMantis
       # - id: ClothingShoesBootsMantis
-      # - id: ClothingOuterCoatMantis
-      # - id: ClothingEyesGlassesSunglasses
-      # End of modified code
+      # - id: ClothingHandsGlovesForensic # Deltav - Detective is in charge of investigating crimes.
       - id: ClothingHeadHatFezMantis
+      # - id: ClothingOuterCoatMantis
       - id: ClothingOuterWinterCoatMantis
+      # - id: ClothingEyesGlassesSunglasses
       # Insulative headgear
       - id: ClothingHeadTinfoil
       - id: ClothingHeadCage
         amount: 2
-      # DeltaV - Mantis PsiBreaker - Give the Mantis a small .38 pistol meant to help in dealing with psionics, see Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
-      - id: WeaponPistolPsiBreaker
-      # End of modified code
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml
index ccaa2c81c36..4f2ac846efa 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml
@@ -1,9 +1,7 @@
 - type: entity
   parent: ClothingBeltStorageBase
   id: ClothingBeltMantis
-  # DeltaV - Forensic Mantis Rename - Rename Forensic Mantis to Psionic Mantis
-  name: psionic mantis' belt
-  # End of modified code
+  name: psionic mantis' belt # DeltaV - Rename Forensic Mantis to Psionic Mantis
   description: Perfect for storing all of your equipment.
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml
index 48619eaf07f..8278114d267 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml
@@ -12,9 +12,7 @@
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHoodMysta
-  # DeltaV - Better Mystagogue Hat - Rename the hat from "mystagogue's turban" to "mystagogue's muffin cap"
-  name: mystagogue's muffin cap
-  # End of modified code
+  name: mystagogue's muffin cap # Delta V - Mystagogue new hat
   description: Contrary to its silly name, it's actually a symbol of great academic achievement.
   components:
   - type: Sprite
@@ -124,9 +122,7 @@
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatFezMantis
-  # DeltaV - Forensic Mantis Rename - Rename Forensic Mantis to Psionic Mantis
-  name: psionic mantis' fez
-  # End of modified code
+  name: psionic mantis' fez # DeltaV - Rename Forensic Mantis to Psionic Mantis
   description: A fine red fez with a gold tassel.
   components:
   - type: Sprite