diff --git a/code/modules/smithing/anvil.dm b/code/modules/smithing/anvil.dm
index 34be1ae3e7..e05e3c45db 100644
--- a/code/modules/smithing/anvil.dm
+++ b/code/modules/smithing/anvil.dm
@@ -110,6 +110,8 @@
 	var/list/shapingsteps = list("weak hit", "strong hit", "heavy hit", "fold", "draw", "shrink", "bend", "punch", "upset") //weak/strong/heavy hit affect strength. All the other steps shape.
 	workpiece_state = WORKPIECE_INPROGRESS
 	var/stepdone = input(user, "How would you like to work the metal?") in shapingsteps
+	if(!do_after(user, 20, target = src))
+		return FALSE
 	switch(stepdone)
 		if("weak hit")
 			currentsteps += 1
diff --git a/code/modules/smithing/smithed_items.dm b/code/modules/smithing/smithed_items.dm
index d22003b95c..5da7a0f8f4 100644
--- a/code/modules/smithing/smithed_items.dm
+++ b/code/modules/smithing/smithed_items.dm
@@ -99,7 +99,6 @@
 	dofinish()
 
 /obj/item/smithing/proc/dofinish()
-	visible_message("The finishing of [src].")
 	var/qualname
 	switch(quality)
 		if(-1000 to -5)
@@ -124,6 +123,7 @@
 	mat = mat.name
 	finalitem.name = "[qualname] [mat] [finalitem.name]"
 	finalitem.forceMove(get_turf(src))
+	qdel(src)
 
 /obj/item/smithing/hammerhead
 	name = "smithed hammer head"