diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
index b6bcadcc19d..f659f617952 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -450,7 +450,7 @@
         reagents:
         - ReagentId: UncookedAnimalProteins
           Quantity: 5
-        - ReagentId: ToxinGoblinSave #Frontier: allows goblins to eat rotten meat without takin damage, while dealing damage to other species
+        - ReagentId: ToxinGoblinSafe #Frontier: allows goblins to eat rotten meat without takin damage, while dealing damage to other species
           Quantity: 4
         - ReagentId: Fat
           Quantity: 4
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/Species/goblin.yml b/Resources/Prototypes/_NF/Entities/Mobs/Species/goblin.yml
index 54063d72753..b5630e52060 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/Species/goblin.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/Species/goblin.yml
@@ -58,9 +58,6 @@
     damage:
       types:
         Slash: 3
-  - type: Thieving
-    stealthy: true
-    stripTimeReduction: 1
   - type: Speech
     speechSounds: Alto
   - type: DamageOnHighSpeedImpact
@@ -87,7 +84,6 @@
   - type: Tag
     tags:
     - CanPilot
-    - GoblinMobTag
     - DoorBumpOpener
 
 - type: entity
diff --git a/Resources/Prototypes/_NF/Objects/Consumable/Food/meat_goblin.yml b/Resources/Prototypes/_NF/Objects/Consumable/Food/meat_goblin.yml
index 53e20e63eaa..74a126baf8e 100644
--- a/Resources/Prototypes/_NF/Objects/Consumable/Food/meat_goblin.yml
+++ b/Resources/Prototypes/_NF/Objects/Consumable/Food/meat_goblin.yml
@@ -13,7 +13,7 @@
         reagents:
         - ReagentId: UncookedAnimalProteins
           Quantity: 9
-        - ReagentId: ToxinGoblinSave
+        - ReagentId: ToxinGoblinSafe
           Quantity: 5
   - type: SliceableFood
     count: 3
diff --git a/Resources/Prototypes/_NF/Reagents/Consumables/food.yml b/Resources/Prototypes/_NF/Reagents/Consumables/food.yml
index 90f8738ced0..436c1ce8c62 100644
--- a/Resources/Prototypes/_NF/Reagents/Consumables/food.yml
+++ b/Resources/Prototypes/_NF/Reagents/Consumables/food.yml
@@ -45,7 +45,7 @@
   pricePerUnit: 10
 
 - type: reagent
-  id: ToxinGoblinSave
+  id: ToxinGoblinSafe
   name: reagent-name-toxin
   group: Toxins
   desc: reagent-desc-toxin
diff --git a/Resources/Prototypes/_NF/Voice/speech_emote_sounds.yml b/Resources/Prototypes/_NF/Voice/speech_emote_sounds.yml
index 8553ad053a2..bf9fb97524a 100644
--- a/Resources/Prototypes/_NF/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/_NF/Voice/speech_emote_sounds.yml
@@ -121,14 +121,10 @@
       collection: MaleSneezes
     Cough:
       collection: MaleCoughs
-    CatMeow:
-      collection: CatMeows
     CatHisses:
       collection: CatHisses
     MonkeyScreeches:
       collection: MonkeyScreeches
-    RobotBeep:
-      collection: RobotBeeps
     Yawn:
       collection: MaleYawn
     Snore:
@@ -155,14 +151,10 @@
       collection: FemaleSneezes
     Cough:
       collection: FemaleCoughs
-    CatMeow:
-      collection: CatMeows
     CatHisses:
       collection: CatHisses
     MonkeyScreeches:
       collection: MonkeyScreeches
-    RobotBeep:
-      collection: RobotBeeps
     Yawn:
       collection: FemaleYawn
     Snore: