diff --git a/Makefile b/Makefile
index 82f64583c5..8c0369c1d2 100644
--- a/Makefile
+++ b/Makefile
@@ -470,10 +470,10 @@ doxyclean: doxygen-clean
 doxygen-clean:
 	rm -rf $(DOXYGEN_OUTPUT_DIR)
 
-clean-for-update: doxygen-clean clean-for-update-target
+clean-for-update: doxygen-clean
 	rm -rf $(obj) .xcompile
 
-clean: clean-for-update clean-target clean-utils
+clean: clean-for-update clean-utils clean-payloads
 	rm -f .ccwrap
 
 clean-cscope:
diff --git a/Makefile.inc b/Makefile.inc
index 377ddff994..ab81682ee2 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -676,19 +676,6 @@ decompressor-y += $(CONFIG_MEMLAYOUT_LD_FILE)
 clean-abuild:
 	rm -rf coreboot-builds
 
-clean-for-update-target: clean-payloads
-	rm -f $(obj)/ramstage?* $(obj)/coreboot.romstage $(obj)/coreboot.pre* $(obj)/coreboot.bootblock $(obj)/coreboot.a
-	rm -rf $(obj)/bootblock?* $(obj)/romstage?* $(obj)/location.*
-	rm -f $(obj)/option_table.* $(obj)/crt0.S $(obj)/ldscript
-	rm -f $(obj)/mainboard/$(MAINBOARDDIR)/static.c $(obj)/mainboard/$(MAINBOARDDIR)/config.py $(obj)/mainboard/$(MAINBOARDDIR)/static.dot
-	rm -f $(obj)/mainboard/$(MAINBOARDDIR)/crt0.s $(obj)/mainboard/$(MAINBOARDDIR)/crt0.disasm
-	rm -f $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
-	rm -f $(obj)/mainboard/$(MAINBOARDDIR)/bootblock.* $(obj)/dsdt.*
-	rm -f $(obj)/cpu/x86/smm/smm_bin.c $(obj)/cpu/x86/smm/smm.* $(obj)/cpu/x86/smm/smm
-
-clean-target:
-	rm -f $(obj)/coreboot*
-
 #######################################################################
 # Development utilities
 printcrt0s: