diff --git a/.gitmodules b/.gitmodules
index afa0b87..ed0779a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,3 @@
 [submodule "vendor/github.com/reconquest/import.bash"]
     path = vendor/github.com/reconquest/import.bash
     url = https://github.com/reconquest/import.bash
-[submodule "vendor/github.com/reconquest/ser-go"]
-	path = vendor/github.com/reconquest/ser-go
-	url = https://github.com/reconquest/ser-go
-[submodule "vendor/github.com/zazab/zhash"]
-	path = vendor/github.com/zazab/zhash
-	url = https://github.com/zazab/zhash
diff --git a/Makefile b/Makefile
index f4937e0..e7ca5e0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
-vendor/%/Makefile:
-	bash -c 'source vendor/github.com/reconquest/import.bash/import.bash && \
-		import "$*"'
+build:
+	go build -mod=mod -ldflags -X=main.version=$$(git describe --tags --abbrev=6)
 
-include vendor/github.com/reconquest/test-runner.bash/Makefile
-include vendor/github.com/reconquest/go-test.bash/Makefile
+test:
+	./run_tests -vvvv
diff --git a/vendor/github.com/reconquest/ser-go b/vendor/github.com/reconquest/ser-go
deleted file mode 160000
index 47f084a..0000000
--- a/vendor/github.com/reconquest/ser-go
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 47f084a1e4a5433ac3d6ab6cfe8c1e30028a4d76
diff --git a/vendor/github.com/zazab/zhash b/vendor/github.com/zazab/zhash
deleted file mode 160000
index a8cbf32..0000000
--- a/vendor/github.com/zazab/zhash
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a8cbf322fd9b71e2741202c4dc07624ae7fe8b10