diff --git a/Makefile b/Makefile
index c95c9adb0f..f49105ccf0 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 
 SHELL 	:= /bin/bash
 BINDIR	:= bin
-PKG 		:= github.com/envoyproxy/go-control-plane
+PKG 	:= github.com/envoyproxy/go-control-plane
 
 .PHONY: build
 build:
@@ -30,10 +30,6 @@ test:
 cover:
 	@build/coverage.sh
 
-.PHONY: format
-format:
-	@goimports -local $(PKG) -w -l pkg
-
 .PHONY: examples
 examples:
 	@pushd examples/dyplomat && go build ./... && popd
diff --git a/build/do_ci.sh b/build/do_ci.sh
index dc3badbcac..c2eb787d7a 100755
--- a/build/do_ci.sh
+++ b/build/do_ci.sh
@@ -6,16 +6,8 @@ set -x
 # Needed to avoid issues with go version stamping in CI build
 git config --global --add safe.directory /go-control-plane
 
-go install golang.org/x/tools/cmd/goimports@latest
-
 cd /go-control-plane
 
-NUM_DIFF_LINES=`/go/bin/goimports -local github.com/envoyproxy/go-control-plane -d pkg | wc -l`
-if [[ $NUM_DIFF_LINES > 0 ]]; then
-  echo "Failed format check. Run make format"
-  exit 1
-fi
-
 make build
 make bin/example
 make examples