diff --git a/Makefile b/Makefile
index 151327b2445..08925bfd1fa 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,9 @@ ARTIFACT_DESTINATION_FILE ?= ./tmp/idp.tar.gz
 	brakeman \
 	build_artifact \
 	check \
+	clobber_db \
+	clobber_assets \
+	clobber_logs \
 	docker_setup \
 	download_acuant_sdk \
 	fast_setup \
@@ -34,6 +37,7 @@ ARTIFACT_DESTINATION_FILE ?= ./tmp/idp.tar.gz
 	optimize_assets \
 	optimize_svg \
 	run \
+	tidy \
 	update \
 	urn \
 	README.md \
@@ -268,3 +272,24 @@ README.md: docs/ ## Generates README.md based on the contents of the docs direct
 
 download_acuant_sdk: ## Downloads the most recent Acuant SDK release from Github
 	@scripts/download_acuant_sdk.sh
+
+clobber_db: ## Resets the database for make setup
+	bin/rake db:create
+	bin/rake db:environment:set
+	bin/rake db:reset
+	bin/rake db:environment:set
+	bin/rake dev:prime
+
+clobber_assets: ## Removes (clobbers) assets
+	bin/rake assets:clobber
+	RAILS_ENV=test bin/rake assets:clobber
+
+clobber_logs: ## Purges logs and tmp/
+	rm -f log/*
+	rm -rf tmp/cache/*
+	rm -rf tmp/encrypted_doc_storage
+	rm -rf tmp/letter_opener
+	rm -rf tmp/mails
+
+tidy: clobber_assets clobber_logs ## Remove assets, logs, and unused gems, but leave DB alone
+	bundle clean
diff --git a/bin/setup b/bin/setup
index 323d382db4b..0b637303757 100755
--- a/bin/setup
+++ b/bin/setup
@@ -56,22 +56,13 @@ Dir.chdir APP_ROOT do
   run "yarn install"
 
   puts "\n== Preparing database =="
-  run 'bin/rake db:create'
-  run 'bin/rake db:environment:set'
-  run 'bin/rake db:reset'
-  run 'bin/rake db:environment:set'
-  run 'bin/rake dev:prime'
+  run 'make clobber_db'
 
   puts "\n== Cleaning up old assets =="
-  run "bin/rake assets:clobber"
-  run "RAILS_ENV=test bin/rake assets:clobber"
+  run "make clobber_assets"
 
   puts "\n== Removing old logs and tempfiles =="
-  run "rm -f log/*"
-  run "rm -rf tmp/cache"
-  run "rm -rf tmp/encrypted_doc_storage"
-  run "rm -rf tmp/letter_opener"
-  run "rm -rf tmp/mails"
+  run "make clobber_logs"
 
   puts "\n== Restarting application server =="
   run "mkdir -p tmp"