diff --git a/modular_zzplurt/code/datums/outfit.dm b/modular_zzplurt/code/datums/outfit.dm
index 8482268df6074..066c359ca7976 100644
--- a/modular_zzplurt/code/datums/outfit.dm
+++ b/modular_zzplurt/code/datums/outfit.dm
@@ -30,6 +30,7 @@
 	if(user.ears_extra)
 		user.ears_extra.add_fingerprint(user, ignoregloves = TRUE)
 
+/* Apparently was removed, keeping it just in case
 /datum/outfit/copy_outfit_from_target(mob/living/carbon/human/H)
 	. = ..()
 	if(!.)
@@ -47,6 +48,7 @@
 		wrists = H.wrists.type
 	if(H.ears_extra)
 		ears_extra = H.ears_extra.type
+*/
 
 /datum/outfit/get_types_to_preload()
 	. = ..()
diff --git a/modular_zzplurt/code/modules/mob/living/emote.dm b/modular_zzplurt/code/modules/mob/living/emote.dm
index 4dbacb79bb86a..048e6613600f7 100644
--- a/modular_zzplurt/code/modules/mob/living/emote.dm
+++ b/modular_zzplurt/code/modules/mob/living/emote.dm
@@ -670,8 +670,8 @@
 	emote_type = EMOTE_AUDIBLE
 
 /datum/emote/living/snore/snore2/run_emote(mob/user, params)
-	var/datum/dna/D = user.has_dna()
-	var/say_mod = (D ? D.species.say_mod : "says")
+	var/obj/item/organ/internal/tongue/tongue = user.get_organ_slot(ORGAN_SLOT_TONGUE)
+	var/say_mod = (tongue ? tongue.say_mod : "says")
 	var/list/aaauughh = list(
 		"lets out an <b>earthshaking</b> snore.",
 		"lets out what sounds like a <b>painful</b> snore.",
@@ -790,8 +790,8 @@
 	sound = 'modular_zzplurt/sound/voice/barks/poyo.ogg'
 
 /datum/emote/living/poyo/run_emote(mob/user, params, type_override, intentional)
-	var/datum/dna/D = user.has_dna()
-	var/say_mod = (D ? D.species.say_mod : "says")
+	var/obj/item/organ/internal/tongue/tongue = user.get_organ_slot(ORGAN_SLOT_TONGUE)
+	var/say_mod = (tongue ? tongue.say_mod : "says")
 	message = replacetextEx(message, "%SAYS", say_mod)
 	. = ..()
 
diff --git a/modular_zzplurt/code/modules/species/arachnid.dm b/modular_zzplurt/code/modules/species/arachnid.dm
index 317e61b415c70..5862ca26f9a81 100644
--- a/modular_zzplurt/code/modules/species/arachnid.dm
+++ b/modular_zzplurt/code/modules/species/arachnid.dm
@@ -18,7 +18,6 @@
 	mutanttongue = /obj/item/organ/internal/tongue/arachnid
 	changesource_flags = MIRROR_MAGIC | MIRROR_PRIDE | RACE_SWAP | WABBAJACK | MIRROR_BADMIN | SLIME_EXTRACT
 
-	say_mod = "chitters"
 	inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BUG
 	external_organs = list(
 		/obj/item/organ/external/mandibles = "Plain",