diff --git a/.gitignore b/.gitignore
index 51b19d86..55581c1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,34 +5,22 @@
 /vendor
 
 # binaries
-/warewulfd
-/wwbuild
 /wwclient
 /wwctl
-/bash_completion
-/config_defaults
 /update_configuration
 /wwapic
 /wwapid
 /wwapird
-/print_defaults
 
 # other created files
-/docs/man/man1/*.1.gz
+/docs/man/man1
 /docs/man/man5/*.5.gz
-/bash_completion.d
 /etc/bash_completion.d/
 warewulf.spec
-internal/pkg/buildconfig/setconfigs.go
 internal/pkg/config/buildconfig.go
 include/systemd/warewulfd.service
-_dist/
-/config
 warewulf-*.tar.gz
 Defaults.mk
-/etc/wwapid.config
-/etc/wwapic.config
-/etc/wwapird.config
 /etc/wwapid.conf
 /etc/wwapic.conf
 /etc/wwapird.conf
diff --git a/Makefile b/Makefile
index 11e577b4..6a65a2df 100644
--- a/Makefile
+++ b/Makefile
@@ -185,30 +185,19 @@ proto:
 contclean:
 	rm -f Defaults.mk
 	rm -f $(WAREWULF)-$(VERSION).tar.gz
-	rm -f bash_completion
-	rm -f config_defaults
-	rm -f etc/wwapi{c,d,rd}.conf
-	rm -f etc/wwapi{c,d,rd}.config
+	rm -f wwapi{c,d,rd} etc/wwapi{c,d,rd}.conf
 	rm -f include/systemd/warewulfd.service
-	rm -f internal/pkg/buildconfig/setconfigs.go
 	rm -f internal/pkg/config/buildconfig.go
-	rm -f print_defaults
 	rm -f update_configuration
 	rm -f warewulf.spec
-	rm -f warewulf-*.tar.gz
-	rm -f wwapic
-	rm -f wwapid
-	rm -f wwapird
 	rm -f wwclient
 	rm -f wwctl
 	rm -rf $(TOOLS_DIR)
-	rm -rf bash_completion.d
-	rm -rf /config
 	rm -rf .dist/
-	rm -rf _dist/
 	rm -rf etc/bash_completion.d/
 	rm -rf userdocs/_*
 	rm -rf userdocs/reference/*
+	rm -rf etc/defaults.conf
 
 .PHONY: clean
 clean: contclean