diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 711af230fd9d..4e7a1d2a1145 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -93,13 +93,6 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
 			cmd_mentor_pm(href_list["mentor_msg"],null)
 		return
 
-	// Mentor Follow
-	if(href_list["mentor_follow"])
-		var/mob/living/M = locate(href_list["mentor_follow"])
-		if(istype(M))
-			mentor_follow(M)
-		return
-
 	//byond bug ID:2256651
 	if (asset_cache_job && (asset_cache_job in completed_asset_jobs))
 		to_chat(src, "<span class='danger'>An error has been detected in how your client is receiving resources. Attempting to correct.... (If you keep seeing these messages you might want to close byond and reconnect)</span>")
diff --git a/code/modules/mentor/follow.dm b/code/modules/mentor/follow.dm
deleted file mode 100644
index 484ea8a0a045..000000000000
--- a/code/modules/mentor/follow.dm
+++ /dev/null
@@ -1,70 +0,0 @@
-/datum/mentor_click_interceptor
-/datum/mentor_click_interceptor/proc/InterceptClickOn(mob/user, params, atom/target)
-	return TRUE
-
-/client/proc/mentor_follow(mob/living/M)
-	if(!check_mentor())
-		return
-
-	if(isnull(M))
-		return
-
-	if(!istype(usr, /mob))
-		return
-
-	if(!holder)
-		var/datum/mentors/mentor = GLOB.mentor_datums[usr.client.ckey]
-		mentor.following = M
-	else
-		holder.following = M
-
-	if(check_rights(R_ADMIN, 0))
-		var/client/C = usr.client
-		var/can_ghost = TRUE
-		if(!isobserver(usr))
-			can_ghost = C.admin_ghost()
-
-		if(!can_ghost)
-			return
-		var/mob/dead/observer/A = C.mob
-		A.ManualFollow(M)
-		return
-
-	usr.reset_perspective(M)
-	usr.client.click_intercept = new /datum/mentor_click_interceptor
-	usr.client.mob.notransform = TRUE
-	src.verbs += /client/proc/mentor_unfollow
-
-	to_chat(GLOB.admins, "<span class='mentor'><span class='prefix'>MENTOR:</span> <EM>[key_name(usr)]</EM> is now following <EM>[key_name(M)].</span>")
-	to_chat(usr, "<span class='info'>You are now following [M]. Click the \"Stop Following\" button in the Mentor tab to stop.</span>")
-	log_mentor("[key_name(usr)] began following [key_name(M)].")
-
-/client/proc/mentor_unfollow()
-	set category = "Mentor"
-	set name = "Stop Following"
-	set desc = "Stop following the followed."
-
-	if(!check_mentor())
-		return
-
-	usr.reset_perspective(null)
-	usr.client.click_intercept = null
-	usr.client.mob.notransform = FALSE
-	src.verbs -= /client/proc/mentor_unfollow
-
-	var/following = null
-	if(!holder)
-		var/datum/mentors/mentor = GLOB.mentor_datums[usr.client.ckey]
-		following = mentor.following
-	else
-		following = holder.following
-
-	if(!following)
-		to_chat(usr, "<span class='info'>You're not following anyone.</span>")
-		return
-
-	to_chat(GLOB.admins, "<span class='mentor'><span class='prefix'>MENTOR:</span> <EM>[key_name(usr)]</EM> is no longer following <EM>[key_name(following)].</span>")
-	to_chat(usr, "<span class='info'>You are no longer following [following].</span>")
-	log_mentor("[key_name(usr)] stopped following [key_name(following)].")
-
-	following = null
diff --git a/code/modules/mentor/mentor_verbs.dm b/code/modules/mentor/mentor_verbs.dm
index 6ba3720e1b5f..841706e6e86e 100644
--- a/code/modules/mentor/mentor_verbs.dm
+++ b/code/modules/mentor/mentor_verbs.dm
@@ -3,7 +3,6 @@ GLOBAL_LIST_INIT(mentor_verbs, list(
 	/client/proc/show_mentor_memo,
 	/client/proc/cmd_mentor_say,
 	/client/proc/cmd_mentor_dementor,
-	/client/proc/mentor_unfollow
 	))
 GLOBAL_PROTECT(mentor_verbs)
 
diff --git a/code/modules/mentor/verbs/mentorhelp.dm b/code/modules/mentor/verbs/mentorhelp.dm
index a81ec907320c..c2c82e6230bc 100644
--- a/code/modules/mentor/verbs/mentorhelp.dm
+++ b/code/modules/mentor/verbs/mentorhelp.dm
@@ -34,7 +34,7 @@
 		else
 			.["present"]++
 
-/proc/key_name_mentor(whom, include_link = null, include_name = 0, include_follow = 0, char_name_only = 0)
+/proc/key_name_mentor(whom, include_link = null, include_name = 0, char_name_only = 0)
 	var/mob/M
 	var/client/C
 	var/key
@@ -91,7 +91,4 @@
 	else
 		. += "*no key*"
 
-	if(include_follow)
-		. += " (<a href='?mentor_follow=[REF(M)]'>F</a>)"
-
 	return .
diff --git a/code/modules/mentor/verbs/mentorpm.dm b/code/modules/mentor/verbs/mentorpm.dm
index e860d126db0e..3c4396f034dc 100644
--- a/code/modules/mentor/verbs/mentorpm.dm
+++ b/code/modules/mentor/verbs/mentorpm.dm
@@ -67,17 +67,17 @@
 	var/show_char = CONFIG_GET(flag/mentors_mobname_only)
 	if(check_mentor_other(C))
 		if(check_mentor())	//both are mentors
-			to_chat(C, "<span class='notice'>Mentor PM from-<b>[key_name_mentor(src, C, 1, 0, 0)]</b>: [msg]</span>")
-			to_chat(src, "<span class='green'>Mentor PM to-<b>[key_name_mentor(C, C, 1, 0, 0)]</b>: [msg]</span>")
+			to_chat(C, "<span class='notice'>Mentor PM from-<b>[key_name_mentor(src, C, 1, 0)]</b>: [msg]</span>")
+			to_chat(src, "<span class='green'>Mentor PM to-<b>[key_name_mentor(C, C, 1, 0)]</b>: [msg]</span>")
 
 		else		//recipient is an mentor but sender is not
-			to_chat(C, "<span class='notice'>Reply PM from-<b>[key_name_mentor(src, C, 1, 0, show_char)]</b>: [msg]</span>")
+			to_chat(C, "<span class='notice'>Reply PM from-<b>[key_name_mentor(src, C, 1, show_char)]</b>: [msg]</span>")
 			to_chat(src, "<span class='green'>Mentor PM to-<b>[key_name_mentor(C, C, 1, 0, 0)]</b>: [msg]</span>")
 
 	else
 		if(check_mentor())	//sender is an mentor but recipient is not.
-			to_chat(C, "<span class='notice'>Mentor PM from-<b>[key_name_mentor(src, C, 1, 0, 0)]</b>: [msg]</span>")
-			to_chat(src, "<span class='green'>Mentor PM to-<b>[key_name_mentor(C, C, 1, 0, show_char)]</b>: [msg]</span>")
+			to_chat(C, "<span class='notice'>Mentor PM from-<b>[key_name_mentor(src, C, 1, 0)]</b>: [msg]</span>")
+			to_chat(src, "<span class='green'>Mentor PM to-<b>[key_name_mentor(C, C, 1, show_char)]</b>: [msg]</span>")
 
 	//we don't use message_Mentors here because the sender/receiver might get it too
 	for(var/client/X in GLOB.mentors)
diff --git a/shiptest.dme b/shiptest.dme
index c0a77d994a68..939934ea7b06 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -2349,7 +2349,6 @@
 #include "code\modules\mapping\space_management\space_level.dm"
 #include "code\modules\mapping\space_management\traits.dm"
 #include "code\modules\mapping\space_management\zlevel_manager.dm"
-#include "code\modules\mentor\follow.dm"
 #include "code\modules\mentor\holder2.dm"
 #include "code\modules\mentor\mentor_ranks.dm"
 #include "code\modules\mentor\mentor_verbs.dm"