diff --git a/code/__defines/hud.dm b/code/__defines/hud.dm
index 0291f2e4fc..286d97f49a 100644
--- a/code/__defines/hud.dm
+++ b/code/__defines/hud.dm
@@ -164,9 +164,7 @@
 #define ui_genetic_master "EAST-1:16,NORTH-3:16"
 
 // Ghost ones
-// CHOMPedit
 #define ui_ghost_returntomenu "SOUTH:6,CENTER-4:24"
-// CHOMPedit
 #define ui_ghost_vr "SOUTH: 6,CENTER-3:24"
 #define ui_ghost_jumptomob "SOUTH:6,CENTER-2:24"
 #define ui_ghost_orbit "SOUTH:6,CENTER-1:24"
diff --git a/code/controllers/subsystems/mail.dm b/code/controllers/subsystems/mail.dm
index 036035a2e5..874319a427 100644
--- a/code/controllers/subsystems/mail.dm
+++ b/code/controllers/subsystems/mail.dm
@@ -24,7 +24,7 @@ SUBSYSTEM_DEF(mail)
 	// Collect recipients
 	var/list/mail_recipients = list()
 	for(var/mob/living/carbon/human/player_human in player_list)
-		if(player_human.stat != DEAD && player_human.client && player_human.client.inactivity <= 10 MINUTES && player_human.job != JOB_OUTSIDER && player_human.job != JOB_ANOMALY && player_human.job != JOB_VR && !player_is_antag(player_human.mind)) // Only alive, active and NT employeers should be getting mail. // CHOMPEdit, outsider, anomaly, vr
+		if(player_human.stat != DEAD && player_human.client && player_human.client.inactivity <= 10 MINUTES && player_human.job != JOB_OUTSIDER && player_human.job != JOB_ANOMALY && player_human.job != JOB_VR && !player_is_antag(player_human.mind)) // Only alive, active and NT employeers should be getting mail.
 			mail_recipients += player_human
 
 	// Creates mail for all the mail waiting to arrive, if there's nobody to receive it, it will be a chance of junk mail.
diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm
index 1fe8f71c83..1f4448786b 100644
--- a/code/game/objects/effects/effect_system.dm
+++ b/code/game/objects/effects/effect_system.dm
@@ -589,10 +589,6 @@ steam.start() -- spawns the effect
 			round(min(flash, BOMBCAP_FLASH_RADIUS))
 			)
 
-////////////////////////////////////////////
-// A fancier teleport, used in hyper pads
-////////////////////////////////////////////
-
 /obj/effect/effect/teleport_greyscale
 	name = "teleportation"
 	icon = 'icons/effects/effects.dmi'
diff --git a/code/modules/client/preference_setup/vore/04_resleeving.dm b/code/modules/client/preference_setup/vore/04_resleeving.dm
index d4e9a0d408..43835334fe 100644
--- a/code/modules/client/preference_setup/vore/04_resleeving.dm
+++ b/code/modules/client/preference_setup/vore/04_resleeving.dm
@@ -29,14 +29,14 @@
 		spawn(50)
 			if(QDELETED(character) || QDELETED(pref))
 				return // They might have been deleted during the wait
-			if(!character.virtual_reality_mob && !(/mob/living/carbon/human/proc/exit_vr in character.verbs)) // CHOMPedit start: janky fix to prevent resleeving VR avatars but beats refactoring transcore
+			if(!character.virtual_reality_mob && !(/mob/living/carbon/human/proc/exit_vr in character.verbs)) //Janky fix to prevent resleeving VR avatars but beats refactoring transcore
 				if(pref.resleeve_scan)
 					var/datum/transhuman/body_record/BR = new()
 					BR.init_from_mob(character, pref.resleeve_scan, pref.resleeve_lock)
 				if(pref.mind_scan)
 					var/datum/transcore_db/our_db = SStranscore.db_by_key(null)
 					if(our_db)
-						our_db.m_backup(character.mind,character.nif,one_time = TRUE) // CHOMPedit end
+						our_db.m_backup(character.mind,character.nif,one_time = TRUE)
 			if(pref.resleeve_lock)
 				character.resleeve_lock = character.ckey
 			character.original_player = character.ckey