diff --git a/tm-monitor/glide.lock b/tm-monitor/glide.lock
index fd70a6e09..2acd9cd19 100644
--- a/tm-monitor/glide.lock
+++ b/tm-monitor/glide.lock
@@ -1,5 +1,5 @@
-hash: 7cd23c2bc6306917cf22ce16d4a1fc681a2572bc06d2cece54a37152bba7030d
-updated: 2017-05-20T17:16:08.287741796-04:00
+hash: 80c204190057df1e74d32ecd7095e8a1a865c3a06671f1a31d5240e1e3ff2c64
+updated: 2017-05-20T17:49:23.646798165-04:00
 imports:
 - name: github.com/btcsuite/btcd
   version: 583684b21bfbde9b5fc4403916fd7c807feb0289
@@ -11,7 +11,6 @@ imports:
   - log
   - log/level
   - log/term
-  - term
 - name: github.com/go-logfmt/logfmt
   version: 390ab7935ee28ec6b286364bba9b4dd6410cb3d5
 - name: github.com/go-stack/stack
@@ -24,19 +23,10 @@ imports:
   version: 3ab3a8b8831546bd18fd182c20687ca853b2bb13
 - name: github.com/kr/logfmt
   version: b84e30acd515aadc4b783ad4ff83aff3299bdfe0
-- name: github.com/mattn/go-colorable
-  version: d898aa9fb31c91f35dd28ca75db377eff023c076
-- name: github.com/mattn/go-isatty
-  version: dda3de49cbfcec471bd7a70e6cc01fcc3ff90109
 - name: github.com/pkg/errors
   version: bfd5150e4e41705ded2129ec33379de1cb90b513
 - name: github.com/rcrowley/go-metrics
   version: 1f30fe9094a513ce4c700b9a54458bbb0c96996c
-- name: github.com/stretchr/testify
-  version: 4d4bfba8f1d1027c4fdbe371823030df51419987
-  subpackages:
-  - assert
-  - require
 - name: github.com/tendermint/abci
   version: 864d1f80b36b440bde030a5c18d8ac3aa8c2949d
   subpackages:
@@ -48,26 +38,12 @@ imports:
   subpackages:
   - edwards25519
   - extra25519
-- name: github.com/tendermint/go-common
-  version: e289af53b6bf6af28da129d9ef64389a4cf7987f
 - name: github.com/tendermint/go-crypto
   version: 7dff40942a64cdeefefa9446b2d104750b349f8a
-- name: github.com/tendermint/go-events
-  version: fddee66d90305fccb6f6d84d16c34fa65ea5b7f6
-- name: github.com/tendermint/go-logger
-  version: cefb3a45c0bf3c493a04e9bcd9b1540528be59f2
-- name: github.com/tendermint/go-rpc
-  version: 15d5b2ac497da95cd2dceb9c087910ccec4dacb2
-  subpackages:
-  - client
 - name: github.com/tendermint/go-wire
   version: 5f88da3dbc1a72844e6dfaf274ce87f851d488eb
   subpackages:
   - data
-- name: github.com/tendermint/log15
-  version: ae0f3d6450da9eac7074b439c8e1c3cabf0d5ce6
-  subpackages:
-  - term
 - name: github.com/tendermint/tendermint
   version: 267f134d44e76efb2adef5f0c993da8a5d5bd1b8
   subpackages:
@@ -82,11 +58,7 @@ imports:
 - name: github.com/tendermint/tmlibs
   version: 306795ae1d8e4f4a10dcc8bdb32a00455843c9d5
   subpackages:
-  - autofile
-  - cli
-  - clist
   - common
-  - db
   - events
   - flowrate
   - log
@@ -112,10 +84,6 @@ imports:
   - internal/timeseries
   - lex/httplex
   - trace
-- name: golang.org/x/sys
-  version: 76cc09b634294339fa19ec41b5f2a0b3932cea8b
-  subpackages:
-  - unix
 - name: google.golang.org/grpc
   version: 8b2e129857480cb0f07ef7d9d10b8b252c7ac984
   subpackages:
@@ -138,3 +106,8 @@ testImports:
   version: d8ed2627bdf02c080bf22230dbb337003b7aba2d
   subpackages:
   - difflib
+- name: github.com/stretchr/testify
+  version: 4d4bfba8f1d1027c4fdbe371823030df51419987
+  subpackages:
+  - assert
+  - require
diff --git a/tm-monitor/glide.yaml b/tm-monitor/glide.yaml
index f45fc5fad..53637fb44 100644
--- a/tm-monitor/glide.yaml
+++ b/tm-monitor/glide.yaml
@@ -1,24 +1,25 @@
 package: github.com/tendermint/tools/tm-monitor
 import:
-- package: github.com/tendermint/go-common
-- package: github.com/tendermint/go-events
-- package: github.com/tendermint/go-logger
-- package: github.com/tendermint/tendermint
-  version: develop
+- package: github.com/go-kit/kit
   subpackages:
-  - types
-  - rpc/core/types
-- package: github.com/tendermint/go-wire
+  - log
+- package: github.com/gorilla/websocket
+- package: github.com/pkg/errors
 - package: github.com/rcrowley/go-metrics
-- package: github.com/stretchr/testify
 - package: github.com/tendermint/go-crypto
-- package: github.com/gorilla/websocket
-- package: github.com/tendermint/go-rpc
+- package: github.com/tendermint/tendermint
   version: develop
   subpackages:
-  - client
-- package: github.com/go-kit/kit
+  - rpc/core/types
+  - rpc/lib/client
+  - rpc/lib/server
+  - types
+- package: github.com/tendermint/tmlibs
   subpackages:
+  - events
   - log
-  - term
-- package: github.com/pkg/errors
+testImport:
+- package: github.com/stretchr/testify
+  subpackages:
+  - assert
+  - require
diff --git a/tm-monitor/main.go b/tm-monitor/main.go
index b88158959..0c841c756 100644
--- a/tm-monitor/main.go
+++ b/tm-monitor/main.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"
 
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 	"github.com/tendermint/tmlibs/log"
 	monitor "github.com/tendermint/tools/tm-monitor/monitor"
 )