diff --git a/code/controllers/hooks-defs.dm b/code/controllers/hooks-defs.dm
index aa38a133cae..59510162e1c 100644
--- a/code/controllers/hooks-defs.dm
+++ b/code/controllers/hooks-defs.dm
@@ -9,17 +9,3 @@
  * Called in gameticker.dm when a round starts.
  */
 /hook/roundstart
-
-/**
- * Mob login hook.
- * Called in login.dm when a player logs in to a mob.
- * Parameters: var/client/client, var/mob/mob
- */
-/hook/mob_login
-
- /**
- * Mob logout hook.
- * Called in logout.dm when a player logs out of a mob.
- * Parameters: var/client/client, var/mob/mob
- */
-/hook/mob_logout
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index 3001b52f399..2953744a824 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -484,14 +484,4 @@
 		if(istype(C)) //We found our corpse, is it inside a morgue?
 			morgue = get(C.loc, /obj/structure/morgue)
 			if(morgue)
-				morgue.update()
-
-/hook/mob_login/proc/update_morgue(var/client/client, var/mob/mob)
-	//Update morgues on login
-	mob.update_morgue()
-	return 1
-
-/hook/mob_logout/proc/update_morgue(var/client/client, var/mob/mob)
-	//Update morgues on logout
-	mob.update_morgue()
-	return 1
+				morgue.update()
\ No newline at end of file
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 0a1346fd0ed..f5f1924e395 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -70,5 +70,4 @@
 			AA.display_to(list(src))
 
 	update_client_colour(0)
-
-	callHook("mob_login", list("client" = client, "mob" = src))
+	update_morgue()
diff --git a/code/modules/mob/logout.dm b/code/modules/mob/logout.dm
index f409d184340..cb92665e2fc 100644
--- a/code/modules/mob/logout.dm
+++ b/code/modules/mob/logout.dm
@@ -16,5 +16,5 @@
 				send2irc(config.admin_notify_irc, "[key_name(src)] logged out - No active admins, [admincounter[2]] non-admin staff, [admincounter[3]] inactive staff.")
 
 	..()
-	callHook("mob_logout", list("client" = client, "mob" = src))
+	update_morgue()
 	return 1
diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm
index c67ccb3f60b..d8e6a239a9a 100644
--- a/code/modules/mob/new_player/login.dm
+++ b/code/modules/mob/new_player/login.dm
@@ -24,8 +24,6 @@
 	sight |= SEE_TURFS
 	GLOB.player_list |= src
 
-	callHook("mob_login", list("client" = client, "mob" = src))
-
 	new_player_panel()
 
 	spawn(30)