diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 8e038ec01..a7549d261 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -92,7 +92,7 @@ jobs:
         env:
           KUSTOMIZE_DOCKER_E2E: false # docker on windows not working well yet
 
-      # TODO: replace specific modules above with this once Windows tests are passing.
+      # TODO (#4001): replace specific modules above with this once Windows tests are passing.
       #- name: Test all modules
       #  run: make test-unit-non-plugin
       #  env:
diff --git a/Makefile b/Makefile
index 4dd05a760..84ed52b2d 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,6 @@
 #
 # Makefile for kustomize CLI and API.
 
-MODULES := '"cmd/config" "api/" "kustomize/" "kyaml/"'
 LATEST_V4_RELEASE=v4.5.4
 
 SHELL := /usr/bin/env bash
@@ -96,7 +95,9 @@ generate-kustomize-api:
 verify-kustomize: \
 	install-tools \
 	lint-kustomize \
-	test-unit-kustomize-all \
+	test-unit-kustomize-api \
+	test-unit-kustomize-cli \
+	test-unit-kustomize-plugins \
 	test-examples-kustomize-against-HEAD \
 	test-examples-kustomize-against-v4-release
 
@@ -123,21 +124,15 @@ check-license: $(MYGOBIN)/addlicense
 lint: $(MYGOBIN)/golangci-lint $(MYGOBIN)/goimports $(builtinplugins)
 	./hack/for-each-module.sh "make lint"
 
-.PHONY: lint-kustomize
-lint-kustomize: $(MYGOBIN)/golangci-lint $(builtinplugins)
-	cd api; $(MAKE) lint
-	cd kustomize; $(MAKE) lint
-	cd cmd/pluginator; $(MAKE) lint
-
 .PHONY: test-unit-all
 test-unit-all: $(builtinplugins)
 	./hack/for-each-module.sh "make test"
 
+# This target is used by our Github Actions CI to run unit tests for all non-plugin modules in multiple GOOS environments.
 .PHONY: test-unit-non-plugin
 test-unit-non-plugin:
 	./hack/for-each-module.sh "make test" "./plugin/*" 15
 
-# This target is used by our Github Actions CI to run unit tests for all non-plugin modules in multiple GOOS environments.
 .PHONY: build-non-plugin-all
 build-non-plugin-all:
 	./hack/for-each-module.sh "make build" "./plugin/*" 15
@@ -154,12 +149,6 @@ test-unit-kustomize-plugins:
 test-unit-kustomize-cli:
 	cd kustomize; $(MAKE) test
 
-.PHONY: test-unit-kustomize-all
-test-unit-kustomize-all: \
-	test-unit-kustomize-api \
-	test-unit-kustomize-cli \
-	test-unit-kustomize-plugins
-
 test-unit-kyaml-all:
 	./hack/kyaml-pre-commit.sh