diff --git a/code/modules/detectivework/footprints_and_rag.dm b/code/modules/detectivework/footprints_and_rag.dm
index 03731b156f..9415bef33d 100644
--- a/code/modules/detectivework/footprints_and_rag.dm
+++ b/code/modules/detectivework/footprints_and_rag.dm
@@ -1,56 +1,19 @@
-
-/mob
-	var/bloody_hands = 0
-
-/obj/item/clothing/gloves
-	var/transfer_blood = 0
-
-
-/obj/item/reagent_containers/glass/rag
-	name = "damp rag"
-	desc = "For cleaning up messes, you suppose."
-	w_class = WEIGHT_CLASS_TINY
-	icon = 'icons/obj/toy.dmi'
-	icon_state = "rag"
+
+/mob
+	var/bloody_hands = 0
+
+/obj/item/clothing/gloves
+	var/transfer_blood = 0
+
+
+/obj/item/reagent_containers/glass/rag
+	name = "damp rag"
+	desc = "For cleaning up messes, you suppose."
+	w_class = WEIGHT_CLASS_TINY
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "rag"
 	flags_1 = NOBLUDGEON_1
 	container_type = OPENCONTAINER_1
-<<<<<<< HEAD
-	amount_per_transfer_from_this = 5
-	possible_transfer_amounts = list()
-	volume = 5
-	spillable = 0
-
-/obj/item/reagent_containers/glass/rag/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] is smothering [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
-	return (OXYLOSS)
-
-/obj/item/reagent_containers/glass/rag/afterattack(atom/A as obj|turf|area, mob/user,proximity)
-	if(!proximity)
-		return
-	if(iscarbon(A) && A.reagents && reagents.total_volume)
-		var/mob/living/carbon/C = A
-		var/reagentlist = pretty_string_from_reagent_list(reagents)
-		if(user.a_intent == INTENT_HARM && !C.is_mouth_covered())
-			reagents.reaction(C, INGEST)
-			reagents.trans_to(C, reagents.total_volume)
-			C.visible_message("<span class='danger'>[user] has smothered \the [C] with \the [src]!</span>", "<span class='userdanger'>[user] has smothered you with \the [src]!</span>", "<span class='italics'>You hear some struggling and muffled cries of surprise.</span>")
-			log_game("[key_name(user)] smothered [key_name(A)] with a damp rag containing [reagentlist]")
-			log_attack("[key_name(user)] smothered [key_name(A)] with a damp rag containing [reagentlist]")
-		else
-			reagents.reaction(C, TOUCH)
-			reagents.clear_reagents()
-			log_game("[key_name(user)] touched [key_name(A)] with a damp rag containing [reagentlist]")
-			log_attack("[key_name(user)] touched [key_name(A)] with a damp rag containing [reagentlist]")
-			C.visible_message("<span class='notice'>[user] has touched \the [C] with \the [src].</span>")
-
-	else if(istype(A) && src in user)
-		user.visible_message("[user] starts to wipe down [A] with [src]!", "<span class='notice'>You start to wipe down [A] with [src]...</span>")
-		if(do_after(user,30, target = A))
-			user.visible_message("[user] finishes wiping off the [A]!", "<span class='notice'>You finish wiping off the [A].</span>")
-			A.clean_blood()
-			A.wash_cream()
-	return
-=======
 	amount_per_transfer_from_this = 5
 	possible_transfer_amounts = list()
 	volume = 5
@@ -86,4 +49,3 @@
 			A.clean_blood()
 			A.wash_cream()
 	return
->>>>>>> 02abe5d... Makes drinking glasses smash when thrown (#32890)