diff --git a/client/auth_user.go b/client/auth_user.go
index 3eb3cd164..6af1c2886 100644
--- a/client/auth_user.go
+++ b/client/auth_user.go
@@ -41,10 +41,6 @@ type UserRoles struct {
 	Roles []Role `json:"roles"`
 }
 
-type userName struct {
-	User string `json:"user"`
-}
-
 func v2AuthURL(ep url.URL, action string, name string) *url.URL {
 	if name != "" {
 		ep.Path = path.Join(ep.Path, defaultV2AuthPrefix, action, name)
diff --git a/client/keys_test.go b/client/keys_test.go
index 9765ddd30..919c7cb68 100644
--- a/client/keys_test.go
+++ b/client/keys_test.go
@@ -1246,7 +1246,6 @@ func TestHTTPKeysAPIGetResponse(t *testing.T) {
 func TestHTTPKeysAPIDeleteAction(t *testing.T) {
 	tests := []struct {
 		key        string
-		value      string
 		opts       *DeleteOptions
 		wantAction httpAction
 	}{
diff --git a/etcdctl/ctlv3/ctl.go b/etcdctl/ctlv3/ctl.go
index 015ca22b8..05a9b8749 100644
--- a/etcdctl/ctlv3/ctl.go
+++ b/etcdctl/ctlv3/ctl.go
@@ -16,7 +16,6 @@
 package ctlv3
 
 import (
-	"text/tabwriter"
 	"time"
 
 	"github.com/coreos/etcd/etcdctl/ctlv3/command"
@@ -32,7 +31,6 @@ const (
 )
 
 var (
-	tabOut      *tabwriter.Writer
 	globalFlags = command.GlobalFlags{}
 )
 
diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go
index db77a1f5a..e3f5e4da8 100644
--- a/etcdmain/etcd.go
+++ b/etcdmain/etcd.go
@@ -400,7 +400,7 @@ func startProxy(cfg *config) error {
 	}
 
 	cfg.dir = path.Join(cfg.dir, "proxy")
-	err = os.MkdirAll(cfg.dir, 0700)
+	err = os.MkdirAll(cfg.dir, privateDirMode)
 	if err != nil {
 		return err
 	}
diff --git a/etcdserver/api/v2http/http.go b/etcdserver/api/v2http/http.go
index 1fd388391..d4a5eab7a 100644
--- a/etcdserver/api/v2http/http.go
+++ b/etcdserver/api/v2http/http.go
@@ -15,7 +15,6 @@
 package v2http
 
 import (
-	"errors"
 	"math"
 	"net/http"
 	"strings"
@@ -35,9 +34,8 @@ const (
 )
 
 var (
-	plog      = capnslog.NewPackageLogger("github.com/coreos/etcd/etcdserver/api", "v2http")
-	mlog      = logutil.NewMergeLogger(plog)
-	errClosed = errors.New("v2http: client closed connection")
+	plog = capnslog.NewPackageLogger("github.com/coreos/etcd/etcdserver/api", "v2http")
+	mlog = logutil.NewMergeLogger(plog)
 )
 
 // writeError logs and writes the given Error to the ResponseWriter
diff --git a/pkg/netutil/netutil.go b/pkg/netutil/netutil.go
index 5a24abed4..4292cd06f 100644
--- a/pkg/netutil/netutil.go
+++ b/pkg/netutil/netutil.go
@@ -116,3 +116,8 @@ func URLStringsEqual(a []string, b []string) bool {
 
 	return urlsEqual(urlsA, urlsB)
 }
+
+func IsNetworkTimeoutError(err error) bool {
+	nerr, ok := err.(net.Error)
+	return ok && nerr.Timeout()
+}
diff --git a/proxy/director.go b/proxy/director.go
index 328dc0094..74f12feee 100644
--- a/proxy/director.go
+++ b/proxy/director.go
@@ -67,10 +67,9 @@ func newDirector(urlsFunc GetProxyURLs, failureWait time.Duration, refreshInterv
 
 type director struct {
 	sync.Mutex
-	ep              []*endpoint
-	uf              GetProxyURLs
-	failureWait     time.Duration
-	refreshInterval time.Duration
+	ep          []*endpoint
+	uf          GetProxyURLs
+	failureWait time.Duration
 }
 
 func (d *director) refresh() {
diff --git a/raft/raft.go b/raft/raft.go
index b56f34aa8..e7da600b7 100644
--- a/raft/raft.go
+++ b/raft/raft.go
@@ -29,8 +29,6 @@ import (
 const None uint64 = 0
 const noLimit = math.MaxUint64
 
-var errNoLeader = errors.New("no leader")
-
 var ErrSnapshotTemporarilyUnavailable = errors.New("snapshot is temporarily unavailable")
 
 // Possible values for StateType.
diff --git a/rafthttp/stream.go b/rafthttp/stream.go
index 8886cfa2c..1a76b89cc 100644
--- a/rafthttp/stream.go
+++ b/rafthttp/stream.go
@@ -374,12 +374,6 @@ func (cr *streamReader) stop() {
 	<-cr.done
 }
 
-func (cr *streamReader) isWorking() bool {
-	cr.mu.Lock()
-	defer cr.mu.Unlock()
-	return cr.closer != nil
-}
-
 func (cr *streamReader) dial(t streamType) (io.ReadCloser, error) {
 	u := cr.picker.pick()
 	uu := u
@@ -500,8 +494,3 @@ func checkStreamSupport(v *semver.Version, t streamType) bool {
 	}
 	return false
 }
-
-func isNetworkTimeoutError(err error) bool {
-	nerr, ok := err.(net.Error)
-	return ok && nerr.Timeout()
-}
diff --git a/storage/watcher_group.go b/storage/watcher_group.go
index 345ac61dd..3f8f8cf3b 100644
--- a/storage/watcher_group.go
+++ b/storage/watcher_group.go
@@ -143,13 +143,6 @@ func (w watcherSetByKey) delete(wa *watcher) bool {
 	return false
 }
 
-type interval struct {
-	begin string
-	end   string
-}
-
-type watcherSetByInterval map[interval]watcherSet
-
 // watcherGroup is a collection of watchers organized by their ranges
 type watcherGroup struct {
 	// keyWatchers has the watchers that watch on a single key