diff --git a/pkg/cephfs/cephconf.go b/pkg/cephfs/cephconf.go
index 44df828f9..c2e831aae 100644
--- a/pkg/cephfs/cephconf.go
+++ b/pkg/cephfs/cephconf.go
@@ -68,10 +68,6 @@ func init() {
 	cephSecretTempl = template.Must(template.New("secret").Parse(cephSecret))
 }
 
-type cephConfigWriter interface {
-	writeToFile() error
-}
-
 type cephConfigData struct {
 	Monitors string
 	VolumeID volumeID
diff --git a/pkg/rbd/rbd.go b/pkg/rbd/rbd.go
index 014a9802b..f2932cfd9 100644
--- a/pkg/rbd/rbd.go
+++ b/pkg/rbd/rbd.go
@@ -47,8 +47,7 @@ type rbd struct {
 }
 
 var (
-	rbdDriver *rbd
-	version   = "1.0.0"
+	version = "1.0.0"
 )
 
 func GetRBDDriver() *rbd {
diff --git a/pkg/rbd/rbd_attach.go b/pkg/rbd/rbd_attach.go
index e24ca02a7..9cdae0451 100644
--- a/pkg/rbd/rbd_attach.go
+++ b/pkg/rbd/rbd_attach.go
@@ -46,18 +46,6 @@ func init() {
 	hasNBD = checkRbdNbdTools()
 }
 
-func getDevFromImageAndPool(pool, image string) (string, bool) {
-	device, found := getRbdDevFromImageAndPool(pool, image)
-	if found {
-		return device, true
-	}
-	device, found = getNbdDevFromImageAndPool(pool, image)
-	if found {
-		return device, true
-	}
-	return "", false
-}
-
 // Search /sys/bus for rbd device that matches given pool and image.
 func getRbdDevFromImageAndPool(pool string, image string) (string, bool) {
 	// /sys/bus/rbd/devices/X/name and /sys/bus/rbd/devices/X/pool
diff --git a/pkg/rbd/rbd_util.go b/pkg/rbd/rbd_util.go
index 03be2b327..ce6b3721f 100644
--- a/pkg/rbd/rbd_util.go
+++ b/pkg/rbd/rbd_util.go
@@ -30,11 +30,7 @@ import (
 
 const (
 	imageWatcherStr = "watcher="
-	rbdImageFormat1 = "1"
 	rbdImageFormat2 = "2"
-	imageSizeStr    = "size "
-	sizeDivStr      = " MB in"
-	kubeLockMagic   = "kubelet_lock_magic_"
 	// The following three values are used for 30 seconds timeout
 	// while waiting for RBD Watcher to expire.
 	rbdImageWatcherInitDelay = 1 * time.Second
diff --git a/pkg/util/cachepersister.go b/pkg/util/cachepersister.go
index f6ae13f9d..c764cc026 100644
--- a/pkg/util/cachepersister.go
+++ b/pkg/util/cachepersister.go
@@ -35,7 +35,7 @@ type CachePersister interface {
 	Delete(identifier string) error
 }
 
-func NewCachePersister(metadataStore string, driverName string) (CachePersister, error) {
+func NewCachePersister(metadataStore, driverName string) (CachePersister, error) {
 	if metadataStore == "k8s_configmap" {
 		glog.Infof("cache-perister: using kubernetes configmap as metadata cache persister")
 		k8scm := &K8sCMCache{}
diff --git a/pkg/util/k8scmcache.go b/pkg/util/k8scmcache.go
index f1e27ba3c..92117fa10 100644
--- a/pkg/util/k8scmcache.go
+++ b/pkg/util/k8scmcache.go
@@ -119,33 +119,32 @@ func (k8scm *K8sCMCache) Create(identifier string, data interface{}) error {
 	if cm != nil && err == nil {
 		glog.V(4).Infof("k8s-cm-cache: configmap already exists, skipping configmap creation")
 		return nil
-	} else {
-		dataJson, err := json.Marshal(data)
-		if err != nil {
-			return errors.Wrap(err, "k8s-cm-cache: marshal error")
-		}
-		cm := &v1.ConfigMap{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      identifier,
-				Namespace: k8scm.Namespace,
-				Labels: map[string]string{
-					csiMetadataLabelAttr: cmLabel,
-				},
-			},
-			Data: map[string]string{},
-		}
-		cm.Data[cmDataKey] = string(dataJson)
-
-		_, err = k8scm.Client.CoreV1().ConfigMaps(k8scm.Namespace).Create(cm)
-		if err != nil {
-			if apierrs.IsAlreadyExists(err) {
-				glog.V(4).Infof("k8s-cm-cache: configmap already exists")
-				return nil
-			}
-			return errors.Wrapf(err, "k8s-cm-cache: couldn't persist %s metadata as configmap", identifier)
-		}
-
 	}
+	dataJSON, err := json.Marshal(data)
+	if err != nil {
+		return errors.Wrap(err, "k8s-cm-cache: marshal error")
+	}
+	cm = &v1.ConfigMap{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      identifier,
+			Namespace: k8scm.Namespace,
+			Labels: map[string]string{
+				csiMetadataLabelAttr: cmLabel,
+			},
+		},
+		Data: map[string]string{},
+	}
+	cm.Data[cmDataKey] = string(dataJSON)
+
+	_, err = k8scm.Client.CoreV1().ConfigMaps(k8scm.Namespace).Create(cm)
+	if err != nil {
+		if apierrs.IsAlreadyExists(err) {
+			glog.V(4).Infof("k8s-cm-cache: configmap already exists")
+			return nil
+		}
+		return errors.Wrapf(err, "k8s-cm-cache: couldn't persist %s metadata as configmap", identifier)
+	}
+
 	glog.V(4).Infof("k8s-cm-cache: configmap %s successfully created\n", identifier)
 	return nil
 }