diff --git a/.gitignore b/.gitignore
index 32cf78e89..d11868025 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,21 +16,4 @@ hack/tls-setup/certs
 /contrib/raftexample/raftexample
 /contrib/raftexample/raftexample-*
 
-# TODO: use dep prune
-# https://github.com/golang/dep/issues/120#issuecomment-306518546
-vendor/**/*
-!vendor/**/
-!vendor/**/*.go
-!vendor/**/*.c
-!vendor/**/*.cpp
-!vendor/**/*.s
-!vendor/**/COPYING*
-!vendor/**/PATENTS*
-!vendor/**/NOTICE*
-!vendor/**/Licence*
-!vendor/**/License*
-!vendor/**/LICENCE*
-!vendor/**/LICENSE*
-vendor/**/*_test.go
-
 *.bak
diff --git a/build b/build
index be8de43f1..ff1285480 100755
--- a/build
+++ b/build
@@ -23,23 +23,6 @@ toggle_failpoints() {
 	fi
 }
 
-etcd_setup_gopath() {
-	echo "Setting GOPATH from vendor directory at 'gopath'"
-	d=$(dirname "$0")
-	CDIR=$(cd "$d" || return && pwd)
-	cd "$CDIR" || return
-	etcdGOPATH="${CDIR}/gopath"
-	# preserve old gopath to support building with unvendored tooling deps (e.g., gofail)
-	if [[ -n "$GOPATH" ]]; then
-		GOPATH=":$GOPATH"
-	fi
-	rm -rf "${etcdGOPATH:?}/"
-	mkdir -p "${etcdGOPATH}/vendor" "${etcdGOPATH}/etcd_src/src/go.etcd.io"
-	export GOPATH=${etcdGOPATH}/vendor:${etcdGOPATH}/etcd_src${GOPATH}
-	ln -s "${CDIR}/vendor" "${etcdGOPATH}/vendor/src"
-	ln -s "${CDIR}" "${etcdGOPATH}/etcd_src/src/go.etcd.io/etcd"
-}
-
 toggle_failpoints_default() {
 	mode="disable"
 	if [[ -n "$FAILPOINTS" ]]; then mode="enable"; fi
@@ -88,10 +71,6 @@ tools_build() {
 
 toggle_failpoints_default
 
-if [[ "${ETCD_SETUP_GOPATH}" == "1" ]]; then
-	etcd_setup_gopath
-fi
-
 # only build when called directly, not sourced
 if echo "$0" | grep "build$" >/dev/null; then
 	etcd_build