diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm
index 1e34af6854..d821e9cc29 100644
--- a/code/modules/mob/living/death.dm
+++ b/code/modules/mob/living/death.dm
@@ -105,6 +105,5 @@
 		S.sharerDies(gibbed)
 
 	set_ssd_indicator(FALSE) //SKYRAT CHANGE - ssd indicator
-	set_typing_indicator(FALSE) //SKYRAT CHANGE
 
 	return TRUE
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index 543ff03f7d..49c987bc62 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -20,13 +20,8 @@
 	if(GLOB.say_disabled)	//This is here to try to identify lag problems
 		to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
 		return
-	//SKYRAT EDIT
-	set_typing_indicator(FALSE)
-	//END OF SKYRAT EDIT
-	if(message)
-		say(message)
-	//clear_typing_indicator()		// clear it immediately! //SKYRAT EDIT
-	//say(message)	//SKYRAT EDIT
+	clear_typing_indicator()		// clear it immediately!
+	say(message)
 
 /mob/verb/me_typing_indicator()
 	set name = "me_indicator"
@@ -50,10 +45,7 @@
 		return
 
 	message = trim(copytext_char(sanitize(message), 1, MAX_MESSAGE_LEN))
-	//SKYRAT EDIT
-	set_typing_indicator(FALSE)
-	//END OF SKYRAT EDIT
-	//clear_typing_indicator()		// clear it immediately! //Skyrat edit
+	clear_typing_indicator()		// clear it immediately!
 
 	usr.emote("me",1,message,TRUE)
 
@@ -65,6 +57,12 @@
 	else
 		return ..()
 
+/proc/uncostumize_say(input, message_mode)
+	. = input
+	if(message_mode == MODE_CUSTOM_SAY)
+		var/customsayverb = findtext(input, "*")
+		return lowertext(copytext_char(input, 1, customsayverb))
+
 /mob/proc/whisper_keybind()
 	var/message = input(src, "", "whisper") as text|null
 	if(!length(message))
diff --git a/sandcode/code/modules/keybindings/bindings_mob.dm b/sandcode/code/modules/keybindings/bindings_mob.dm
deleted file mode 100644
index cf372cde1e..0000000000
--- a/sandcode/code/modules/keybindings/bindings_mob.dm
+++ /dev/null
@@ -1,8 +0,0 @@
-/mob/key_down(_key, client/user)
-	if(user.prefs.toggles & ASYNCHRONOUS_SAY)
-		switch(_key)
-			if("T")
-				src.set_typing_indicator(TRUE)
-			if("M")
-				src.set_typing_indicator(TRUE)
-	return ..() 
diff --git a/sandcode/code/modules/mob/emote.dm b/sandcode/code/modules/mob/emote.dm
index 87f3ae20d5..a937ba4001 100644
--- a/sandcode/code/modules/mob/emote.dm
+++ b/sandcode/code/modules/mob/emote.dm
@@ -13,10 +13,6 @@
 	animate(I, alpha = 255, time = 5, easing = BOUNCE_EASING, pixel_y = 10)
 	QDEL_IN_CLIENT_TIME(I, time)
 
-/mob/emote(act, m_type = null, message = null, intentional = FALSE)
-	. = ..()
-	set_typing_indicator(FALSE)
-
 /datum/emote/living/peep
 	key = "peep"
 	key_third_person = "peeps like a bird"
diff --git a/sandcode/code/modules/mob/mob_movement.dm b/sandcode/code/modules/mob/mob_movement.dm
deleted file mode 100644
index 5b46e49a7b..0000000000
--- a/sandcode/code/modules/mob/mob_movement.dm
+++ /dev/null
@@ -1,3 +0,0 @@
-/mob/Moved(atom/OldLoc, Dir, Forced = FALSE)
-	. = ..()
-	set_typing_indicator(FALSE)
diff --git a/sandcode/code/modules/mob/typing_indicator.dm b/sandcode/code/modules/mob/typing_indicator.dm
deleted file mode 100644
index d0a2afb795..0000000000
--- a/sandcode/code/modules/mob/typing_indicator.dm
+++ /dev/null
@@ -1,39 +0,0 @@
-/mob
-	var/hud_typing = FALSE //set when typing in an input window instead of chatline
-	var/typing
-	var/last_typed
-	var/last_typed_time
-
-	var/static/mutable_appearance/typing_indicator
-
-/mob/proc/set_typing_indicator(var/state)
-	if(!typing_indicator)
-		typing_indicator = mutable_appearance('sandcode/icons/mob/typing_indicator.dmi', "default0", FLY_LAYER)
-	if(client && !stat)
-		if(state)
-			if(!typing)
-				add_overlay(typing_indicator)
-				typing = TRUE
-		else
-			if(typing)
-				cut_overlay(typing_indicator)
-				typing = FALSE
-		return state
-
-/mob/proc/handle_typing_indicator()
-	if(!client)
-		return
-	var/temp = winget(client, "input", "text")
-
-	if (temp != last_typed)
-		last_typed = temp
-		last_typed_time = world.time
-
-	if(length(temp) > 5 && findtext(temp, "Say \"", 1, 7))
-		set_typing_indicator(TRUE)
-		return
-	if(length(temp) > 3 && findtext(temp, "Me ", 1, 5))
-		set_typing_indicator(TRUE)
-		return
-	if(!hud_typing)
-		set_typing_indicator(FALSE) 
diff --git a/tgstation.dme b/tgstation.dme
index f082fcc3c7..161389927b 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -3519,13 +3519,10 @@
 #include "sandcode\code\modules\crafting\recipes\recipes_misc.dm"
 #include "sandcode\code\modules\hydroponics\grown\misc.dm"
 #include "sandcode\code\modules\integrated_electronics\subtypes\output.dm"
-#include "sandcode\code\modules\keybindings\bindings_mob.dm"
 #include "sandcode\code\modules\language\language.dm"
 #include "sandcode\code\modules\misc\misc.dm"
 #include "sandcode\code\modules\mob\emote.dm"
-#include "sandcode\code\modules\mob\mob_movement.dm"
 #include "sandcode\code\modules\mob\say.dm"
-#include "sandcode\code\modules\mob\typing_indicator.dm"
 #include "sandcode\code\modules\mob\dead\observer\observer.dm"
 #include "sandcode\code\modules\mob\living\emote.dm"
 #include "sandcode\code\modules\mob\living\give.dm"