diff --git a/Resources/Prototypes/Body/Organs/Animal/animal.yml b/Resources/Prototypes/Body/Organs/Animal/animal.yml
index 63c9321dad9..fe6dc01b867 100644
--- a/Resources/Prototypes/Body/Organs/Animal/animal.yml
+++ b/Resources/Prototypes/Body/Organs/Animal/animal.yml
@@ -145,11 +145,6 @@
   - type: Item
     size: Small
     heldPrefix: liver
-  - type: Tag # goob edit
-    tags:
-    - Meat
-    - Organ
-    - Liver
 
 - type: entity
   id: OrganAnimalHeart
@@ -177,11 +172,6 @@
   - type: Item
     size: Small
     heldPrefix: heart
-  - type: Tag # goob edit
-    tags:
-    - Meat
-    - Organ
-    - Heart
 
 - type: entity
   id: OrganAnimalKidneys
diff --git a/Resources/Prototypes/_CorvaxNext/tags.yml b/Resources/Prototypes/_CorvaxNext/tags.yml
index 59cdfd38c52..c72c0416f71 100644
--- a/Resources/Prototypes/_CorvaxNext/tags.yml
+++ b/Resources/Prototypes/_CorvaxNext/tags.yml
@@ -9,3 +9,30 @@
 
 - type: Tag
   id: Eyes
+
+- type: Tag # heretics edit
+  id: GasMask
+
+- type: Tag # heretics edit
+  id: Kidneys
+
+- type: Tag # heretics edit
+  id: Lungs
+
+- type: Tag # heretics edit
+  id: Mask
+
+- type: Tag # heretics edit
+  id: Poppy
+
+- type: Tag # heretics edit
+  id: Stomach
+
+- type: Tag # heretics edit
+  id: Table
+
+- type: Tag # heretics edit
+  id: Tongue
+
+- type: Tag # heretics edit
+  id: WaterTank
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 85acb37ed97..6e4b1e53312 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -515,9 +515,6 @@
 - type: Tag
   id: ExplosivePassable
 
-- type: Tag # goob edit
-  id: Eyes
-
 - type: Tag
   id: Figurine
 
@@ -578,9 +575,6 @@
 - type: Tag
   id: Galaxythistle
 
-- type: Tag # goob edit
-  id: GasMask
-
 - type: Tag
   id: GasScrubber
 
@@ -665,9 +659,6 @@
 - type: Tag
   id: Head
 
-- type: Tag # goob edit
-  id: Heart
-
 - type: Tag
   id: HelmetEVA
 
@@ -761,9 +752,6 @@
 - type: Tag
   id: KeyedInstrument
 
-- type: Tag # goob edit
-  id: Kidneys
-
 - type: Tag
   id: KitchenKnife
 
@@ -782,12 +770,6 @@
 - type: Tag
   id: Lime
 
-- type: Tag # goob edit
-  id: Liver
-
-- type: Tag # goob edit
-  id: Lungs
-
 - type: Tag
   id: Machete
 
@@ -852,9 +834,6 @@
 - type: Tag
   id: MailingUnitElectronics
 
-- type: Tag # goob edit
-  id: Mask
-
 - type: Tag
   id: Matchstick
 
@@ -942,9 +921,6 @@
 - type: Tag
   id: Ore
 
-- type: Tag # goob edit
-  id: Organ
-
 - type: Tag
   id: Packet
 
@@ -1023,9 +999,6 @@
 - type: Tag
   id: PlushieSharkPink
 
-- type: Tag # goob edit
-  id: Poppy
-
 - type: Tag
   id: Potato
 
@@ -1219,9 +1192,6 @@
 - type: Tag
   id: Steak
 
-- type: Tag # goob edit
-  id: Stomach
-
 - type: Tag
   id: StringInstrument
 
@@ -1258,9 +1228,6 @@
 - type: Tag
   id: Spellbook
 
-- type: Tag # goob edit
-  id: Table
-
 - type: Tag
   id: TabletopBoard
 
@@ -1282,9 +1249,6 @@
 - type: Tag
   id: TimerSignalElectronics
 
-- type: Tag # goob edit
-  id: Tongue
-
 - type: Tag
   id: Toolbox
 
@@ -1354,9 +1318,6 @@
 - type: Tag
   id: WeaponShotgunKammerer
 
-- type: Tag # goob edit
-  id: WaterTank
-
 - type: Tag
   id: WeldingMask