diff --git a/.gitmodules b/.gitmodules
index c9f17b4..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +0,0 @@
-[submodule "src/vendor/github.com/junegunn/go-shellwords"]
-	path = src/vendor/github.com/junegunn/go-shellwords
-	url = https://github.com/junegunn/go-shellwords.git
-[submodule "src/vendor/github.com/junegunn/go-runewidth"]
-	path = src/vendor/github.com/junegunn/go-runewidth
-	url = https://github.com/junegunn/go-runewidth.git
diff --git a/src/Makefile b/src/Makefile
index e125283..abdd6ef 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -41,8 +41,8 @@ android-build:
 	rm -f $(RELEASEARM7)
 
 test:
-	GO15VENDOREXPERIMENT=1 go get
-	GO15VENDOREXPERIMENT=1 SHELL=/bin/sh go test -v ./...
+	go get
+	SHELL=/bin/sh go test -v ./...
 
 install: $(BINDIR)/fzf
 
@@ -53,10 +53,10 @@ clean:
 	cd fzf && rm -f fzf-*
 
 fzf/$(BINARY32): $(SOURCES)
-	cd fzf && GO15VENDOREXPERIMENT=1 GOARCH=386 CGO_ENABLED=1 go build -a -o $(BINARY32)
+	cd fzf && GOARCH=386 CGO_ENABLED=1 go build -a -o $(BINARY32)
 
 fzf/$(BINARY64): $(SOURCES)
-	cd fzf && GO15VENDOREXPERIMENT=1 go build -a -tags "$(TAGS)" -o $(BINARY64)
+	cd fzf && go build -a -tags "$(TAGS)" -o $(BINARY64)
 
 $(BINDIR)/fzf: fzf/$(BINARY64) | $(BINDIR)
 	cp -f fzf/$(BINARY64) $(BINDIR)
diff --git a/src/vendor/github.com/junegunn/go-runewidth b/src/vendor/github.com/junegunn/go-runewidth
deleted file mode 160000
index 63c378b..0000000
--- a/src/vendor/github.com/junegunn/go-runewidth
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 63c378b851290989b19ca955468386485f118c65
diff --git a/src/vendor/github.com/junegunn/go-shellwords b/src/vendor/github.com/junegunn/go-shellwords
deleted file mode 160000
index 35d512a..0000000
--- a/src/vendor/github.com/junegunn/go-shellwords
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 35d512af75e283aae4ca1fc3d44b159ed66189a4