diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index fc5fcd5e99d..094f0749bc7 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -154,8 +154,6 @@
 	in human click code to allow glove touches only at melee range.
 */
 /mob/proc/UnarmedAttack(var/atom/A, var/proximity_flag)
-	if(ismob(A))
-		changeNext_move(CLICK_CD_MELEE)
 	return
 
 /*
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index 3bd7e96ee4c..b8b80c0f546 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -11,7 +11,6 @@
 		visible_message("<span class='danger'>[src] has been hit by [user] with [W].</span>")
 
 /mob/living/attackby(obj/item/I, mob/user)
-	user.changeNext_move(CLICK_CD_MELEE)
 	I.attack(src, user)
 
 /mob/living/proc/attacked_by(var/obj/item/I, var/mob/living/user, var/def_zone)
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index d7bee468516..91b01829069 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -429,7 +429,6 @@
 		if(istype(O, /obj/item/weapon/kitchenknife) || istype(O, /obj/item/weapon/butch))
 			harvest()
 
-	user.changeNext_move(CLICK_CD_MELEE)
 	var/damage = 0
 	if(O.force)
 		if(O.force >= force_threshold)