diff --git a/Makefile b/Makefile
index 3f9b71db7..8b630857a 100644
--- a/Makefile
+++ b/Makefile
@@ -5,11 +5,15 @@ help:
 	@echo "Nothing to see here, go away"
 
 .PHONY: backend-%
-backend-%: .develop.env --stack-work-$*
-	( $(MAKE) --backend-$* || $(MAKE) --stack-krow-$* ) && ( $(MAKE) --stack-krow-$* )
+backend-%: .develop.env # --stack-work-$*
+	( $(MAKE) -- --backend-$* || $(MAKE) -- --stack-krow-$* ) && ( $(MAKE) -- --stack-krow-$* )
+
+.PHONY: --backend-build
+--backend-build: .develop.env
+	stack build --fast --profile --library-profiling --executable-profiling --flag uniworx:-library-only --flag uniworx:dev
 
 .PHONY: database
-database: .develop.env --stack-work-build
+database: .develop.env # --stack-work-build
 	( $(MAKE) -- --database || $(MAKE) -- --stack-krow-build ) && ( $(MAKE) -- --stack-krow-build )
 
 .PHONY: --database
@@ -27,7 +31,7 @@ node_modules: .npmrc package.json
 .PHONY: clean
 clean:
 	rm -rf node_modules
-	rm -rf .stack-work .stack-work-build .stack-work-run .stack-work-test .stack-work-doc
+	rm -rf .stack-work # .stack-work-build .stack-work-run .stack-work-test .stack-work-doc
 
 .PHONY: %.lock
 %.lock:
@@ -37,20 +41,16 @@ clean:
 .develop.env:
 	(in-develop | grep -q 'In develop') || (echo "Not in develop!" 2>&1; exit 1)
 
-.PHONY: --backend-build
---backend-build:
-	stack build --fast --profile --library-profiling --executable-profiling --flag uniworx:-library-only --flag uniworx:dev
-
-.PHONY: --stack-work-%
---stack-work-%: .stack-work.lock
-	[[ -d .stack-work && -d .stack-work-$* ]] && (echo ".stack-work collides with .stack-work-$*, please resolve manually" 1>&2; exit 1) || :
-	[[ ! -d .stack-work-$* ]] || mv .stack-work-$* .stack-work
-
-.PHONY: --stack-krow-%
---stack-krow-%:
-	[[ ! -d .stack-work-$* ]] || ( echo ".stack-work-$* already exists, please resolve manually" 1>&2 ; exit 1 )
-	mv .stack-work .stack-work-$*
-	flock -u .stack-work.lock true
+# .PHONY: --stack-work-%
+# --stack-work-%: .stack-work.lock
+# 	[[ -d .stack-work && -d .stack-work-$* ]] && (echo ".stack-work collides with .stack-work-$*, please resolve manually" 1>&2; exit 1) || :
+# 	[[ ! -d .stack-work-$* ]] || mv .stack-work-$* .stack-work
+# 
+# .PHONY: --stack-krow-%
+# --stack-krow-%:
+# 	[[ ! -d .stack-work-$* ]] || ( echo ".stack-work-$* already exists, please resolve manually" 1>&2 ; exit 1 )
+# 	mv .stack-work .stack-work-$*
+# 	flock -u .stack-work.lock true
 
 # TODO: yarn2nix target