diff --git a/Makefile b/Makefile
index d453f7ad..ca970339 100644
--- a/Makefile
+++ b/Makefile
@@ -25,11 +25,12 @@ ensure_tools:
 	go get $(GOTOOLS)
 
 prepgen: install
-	cd ../go-wire && make tools
 	go install ./vendor/github.com/btcsuite/btcutil/base58
 	go install ./vendor/github.com/stretchr/testify/assert
 	go install ./vendor/github.com/stretchr/testify/require
 	go install ./vendor/golang.org/x/crypto/bcrypt
 
-codegen: prepgen
-	gen
+codegen: 
+	@echo "--> regenerating all interface wrappers"
+	@gen
+	@echo "Done!"
diff --git a/_gen.go b/_gen.go
index 36e39887..a98feaf4 100644
--- a/_gen.go
+++ b/_gen.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	_ "github.com/tendermint/go-wire/data"
+	_ "github.com/tendermint/go-wire/gen"
 	_ "github.com/clipperhouse/stringer"
-	_ "github.com/clipperhouse/set"
 )