diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm
index bd62d546b9..f77fe37333 100644
--- a/code/datums/traits/negative.dm
+++ b/code/datums/traits/negative.dm
@@ -363,23 +363,3 @@
 	gain_text = "<span class='danger'>There's a lot on your mind right now.</span>"
 	lose_text = "<span class='notice'>Your mind finally feels calm.</span>"
 	medical_record_text = "Patient's mind is in a vulnerable state, and cannot recover from traumatic events."
-
-//For reviewers: Removal requested, commented out until the end of review (will remove when fixing merge conflicts). I'll probably rewrited
-/*Fixed quirk so that it's less impactful at the moment and doesn't override player autonomy (For the people in the discord who really want it.) See if that helps
-/datum/quirk/hypno
-	name = "Hypnotherapy user"
-	desc = "You had hypnotherapy right before your shift, you're not sure it had any effects, though."
-	mob_trait = "hypnotherapy"
-	value = -1 //I mean, it can be a really bad trait to have, but on the other hand, some people want it?
-	gain_text = "<span class='notice'>You really think the hypnotherapy helped you out.</span>"
-	//lose_text = "<span class='notice'>You forget about the hypnotherapy you had, or did you even have it?</span>"
-
-/datum/quirk/hypno/add()
-   //You caught me, it's not actually based off a trigger, stop spoiling the effect! Code diving ruins the magic!
-   addtimer(CALLBACK(src, /datum/quirk/hypno.proc/triggered, quirk_holder), rand(120, 360))//increase by 100, it's lower so I can test it.
-
-//DOES NOT give any indication when someone is triggered - this is intentional so people don't abuse it, you're supposed to get a random thing said to you as a mini objective.
-/datum/quirk/hypno/proc/triggered(quirk_holder)//I figured I might as well make a trait of code I added.
-	var/mob/living/carbon/human/H = quirk_holder
-	H.apply_status_effect(/datum/status_effect/trance, 1000, TRUE, TRUE)
-*/
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index f1c0de9c0d..8c02138900 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -1325,7 +1325,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
 	desc = "A small device intended for recharging Cryptographic Sequencers. Using it will add five extra charges to the Cryptographic Sequencer."
 	item = /obj/item/emagrecharge
 	cost = 2
- 
+
 /datum/uplink_item/device_tools/cutouts
 	name = "Adaptive Cardboard Cutouts"
 	desc = "These cardboard cutouts are coated with a thin material that prevents discoloration and makes the images on them appear more lifelike. \
@@ -1861,16 +1861,6 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
 			Please note that this kit did NOT pass quality control."
 	item = /obj/item/storage/box/syndie_kit/chameleon/broken
 
-//ported from tg as is along with functions, removal requested.
-//Commented out, will remove when fixing merge conflicts
-/*
-/datum/uplink_item/device_tools/hypnotic_flash
-	name = "Hypnotic Flash"
-	desc = "A modified flash able to hypnotize targets. If the target is not in a mentally vulnerable state, it will only confuse and pacify them temporarily."
-	item = /obj/item/assembly/flash/hypnotic
-	cost = 7
-*/
-
 /datum/uplink_item/badass/costumes
 	include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
 	cost = 4