diff --git a/CODEOWNERS b/CODEOWNERS
index 629180bd..b6e88321 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1 +1 @@
-* @MatousJobanek @xcoulon @alexeykazakov @rajivnathan @ranakan19 @sbryzak @mfrancisc
+* @MatousJobanek @xcoulon @alexeykazakov @rajivnathan @ranakan19 @mfrancisc
diff --git a/make/clean.mk b/make/clean.mk
index 880262da..53936c1e 100644
--- a/make/clean.mk
+++ b/make/clean.mk
@@ -1,4 +1,5 @@
 .PHONY: clean
+## runs go clean
 clean:
-	$(Q)-rm -rf ${V_FLAG} $(OUT_DIR) ./vendor
+	$(Q)-rm -rf ${V_FLAG} $(OUT_DIR)
 	$(Q)go clean ${X_FLAG} ./...
\ No newline at end of file
diff --git a/make/go.mk b/make/go.mk
index dba57125..ec5fc2e6 100644
--- a/make/go.mk
+++ b/make/go.mk
@@ -8,27 +8,26 @@ GO111MODULE?=on
 export GO111MODULE
 
 .PHONY: build
-## Build
-build: $(shell find . -path ./vendor -prune -o -name '*.go' -print)
+## runs go build
+build:
 	$(Q)CGO_ENABLED=0 GOARCH=amd64 GOOS=linux \
 	    go build ./...
 
-.PHONY: vendor
-vendor:
-	$(Q)go mod vendor
-
 .PHONY: verify-dependencies
 ## Runs commands to verify after the updated dependecies of toolchain-common/API(go mod replace), if the repo needs any changes to be made
 verify-dependencies: tidy vet build test lint-go-code
 
 .PHONY: tidy
+## runs go mod tidy
 tidy: 
 	go mod tidy
 
 .PHONY: vet
+## runs go mod vet ./...
 vet:
 	go vet ./...
 
 .PHONY: verify-replace-run
+## downloads all the repos that depend on toolchain-common, installs the current version of the library and runs all the verifications in order to check for compatibility and breaking changes
 verify-replace-run:
 	./scripts/verify-replace.sh; 
\ No newline at end of file
diff --git a/scripts/verify-replace.sh b/scripts/verify-replace.sh
index 3dbc8d9e..e54506d0 100755
--- a/scripts/verify-replace.sh
+++ b/scripts/verify-replace.sh
@@ -20,6 +20,10 @@ do
     git clone --depth=1 ${repo} ${repo_path}
     echo "Repo cloned successfully"
     cd ${repo_path}
+    if ! make pre-verify; then
+        ERRORLIST+="($(basename ${repo}))"
+        continue
+    fi
     echo "Initiating 'go mod replace' of current toolchain common version in dependent repos"
     go mod edit -replace github.com/codeready-toolchain/toolchain-common=${C_PATH}
     make verify-dependencies || ERRORLIST+="($(basename ${repo}))"