diff --git a/examples/basecoin/app/handler.go b/examples/basecoin/app/handler.go
index ca067cacf5..69fd171a94 100644
--- a/examples/basecoin/app/handler.go
+++ b/examples/basecoin/app/handler.go
@@ -1,13 +1,10 @@
-XXX Rename AppHandler to DefaultAppHandler.
-XXX Register with a sdk.BaseApp instance to create Basecoin.
-XXX Create TxParser in anotehr file.
+// XXX Rename AppHandler to DefaultAppHandler.
+// XXX Register with a sdk.BaseApp instance to create Basecoin.
+// XXX Create TxParser in anotehr file.
 
 package app
 
 import (
-	wire "github.com/tendermint/go-wire"
-	"github.com/tendermint/go-wire/data"
-
 	sdk "github.com/cosmos/cosmos-sdk"
 	"github.com/cosmos/cosmos-sdk/store"
 )
diff --git a/glide.yaml b/glide.yaml
index 258c028e44..f7d0957143 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -12,7 +12,7 @@ import:
   - server
   - types
 - package: github.com/tendermint/go-crypto
-  version: develop
+  version: sdk2
   subpackages:
   - keys
 - package: github.com/tendermint/go-wire
@@ -27,7 +27,7 @@ import:
   - certifiers/client
   - certifiers/files
 - package: github.com/tendermint/iavl
-  version: develop
+  version: sdk2
 - package: github.com/tendermint/tendermint
   version: develop
   subpackages:
@@ -40,7 +40,7 @@ import:
   - rpc/lib/types
   - types
 - package: github.com/tendermint/tmlibs
-  version: develop
+  version: sdk2
   subpackages:
   - cli
   - cli/flags