diff --git a/pkg/driver/mount.go b/pkg/driver/mount.go
deleted file mode 100644
index 8c274f0..0000000
--- a/pkg/driver/mount.go
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2018 Ji-Young Park(jiyoung.park.dev@gmail.com)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package driver
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/golang/glog"
-
-	"k8s.io/utils/mount"
-)
-
-func isLikelyNotMountPointAttach(targetpath string) (bool, error) {
-	glog.V(6).Info("Checking mount point")
-
-	notMnt, err := mount.New("").IsLikelyNotMountPoint(targetpath)
-	if err != nil {
-		if os.IsNotExist(err) {
-			glog.V(6).Info("Checking make directory")
-			err = os.MkdirAll(targetpath, 0750)
-			if err == nil {
-				notMnt = true
-			}
-		}
-	}
-	return notMnt, err
-}
-
-func isLikelyNotMountPointDetach(targetpath string) (bool, error) {
-	notMnt, err := mount.New("").IsLikelyNotMountPoint(targetpath)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return notMnt, fmt.Errorf("targetpath not found")
-		}
-
-		return notMnt, err
-	}
-	return notMnt, nil
-}
diff --git a/pkg/driver/nodeserver.go b/pkg/driver/nodeserver.go
index 20479bc..554a706 100644
--- a/pkg/driver/nodeserver.go
+++ b/pkg/driver/nodeserver.go
@@ -19,6 +19,7 @@ package driver
 import (
 	"errors"
 	"fmt"
+	"os"
 	"path/filepath"
 	"strings"
 	"time"
@@ -154,60 +155,65 @@ func (ns *nodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis
 		return nil, errors.New(msg)
 	}
 
-	glog.V(5).Infof("Target path: %s", targetPath)
+	glog.V(5).Infof("Checking mount point: %s", targetPath)
 
-	/*
-		notMnt, err := isLikelyNotMountPointAttach(targetPath)
-		if err != nil {
-			return nil, status.Error(codes.Internal, err.Error())
-		}
-	*/
-	notMnt := true
+	// mount device to the target path
+	mounter := &mount.SafeFormatAndMount{
+		Interface: mount.New(""),
+		Exec:      utilexec.New(),
+	}
 
-	if notMnt {
-		exists, err := mount.PathExists(devicePath)
-		if !exists || err != nil {
-			msg := fmt.Sprintf("Could not find ISCSI device: %s", devicePath)
-			glog.V(3).Info(msg)
-			return nil, status.Error(codes.Internal, msg)
-		}
+	notMnt, err := mounter.IsLikelyNotMountPoint(targetPath)
+	if !notMnt {
+		glog.V(5).Infof("%s is already mounted", targetPath)
+		return &csi.NodePublishVolumeResponse{}, nil
+	}
 
-		// mount device to the target path
-		mounter := &mount.SafeFormatAndMount{
-			Interface: mount.New(""),
-			Exec:      utilexec.New(),
+	if err != nil {
+		if !os.IsNotExist(err) {
+			return nil, status.Errorf(codes.Internal, "failed to check mount target: %v", err)
 		}
-
-		options := []string{"rw"}
-		mountFlags := req.GetVolumeCapability().GetMount().GetMountFlags()
-		options = append(options, mountFlags...)
-
-		glog.V(5).Infof(
-			"Mounting %s to %s(fstype: %s, options: %v)",
-			devicePath, targetPath, fsType, options)
-		err = mounter.FormatAndMount(devicePath, targetPath, fsType, options)
+		glog.V(6).Info("Creating mount directory: %s", targetPath)
+		err = os.Mkdir(targetPath, 0750)
 		if err != nil {
-			msg := fmt.Sprintf(
-				"Failed to mount %s to %s(fstype: %s, options: %v): %v",
-				devicePath, targetPath, fsType, options, err)
-			glog.V(5).Info(msg)
-			return nil, status.Error(codes.Internal, msg)
+			return nil, status.Errorf(codes.Internal, "failed to create mount directory: %v", err)
 		}
+	}
 
-		// TODO(jpark):
-		// change owner of the root path:
-		// https://github.com/kubernetes/kubernetes/pull/62486
-		//	 https://github.com/kubernetes/kubernetes/pull/62486/files
-		// https://github.com/kubernetes/kubernetes/issues/66323
-		//	https://github.com/kubernetes/kubernetes/pull/67280/files
+	exists, err := mount.PathExists(devicePath)
+	if !exists || err != nil {
+		msg := fmt.Sprintf("Could not find ISCSI device: %s", devicePath)
+		glog.V(3).Info(msg)
+		return nil, status.Error(codes.Internal, msg)
+	}
 
-		glog.V(5).Infof(
-			"Mounted %s to %s(fstype: %s, options: %v)",
-			devicePath, targetPath, fsType, options)
-	} else {
-		glog.V(5).Infof("%s is already mounted", targetPath)
+	options := []string{"rw"}
+	mountFlags := req.GetVolumeCapability().GetMount().GetMountFlags()
+	options = append(options, mountFlags...)
+
+	glog.V(5).Infof(
+		"Mounting %s to %s(fstype: %s, options: %v)",
+		devicePath, targetPath, fsType, options)
+	err = mounter.FormatAndMount(devicePath, targetPath, fsType, options)
+	if err != nil {
+		msg := fmt.Sprintf(
+			"Failed to mount %s to %s(fstype: %s, options: %v): %v",
+			devicePath, targetPath, fsType, options, err)
+		glog.V(5).Info(msg)
+		return nil, status.Error(codes.Internal, msg)
 	}
 
+	// TODO(jpark):
+	// change owner of the root path:
+	// https://github.com/kubernetes/kubernetes/pull/62486
+	//	 https://github.com/kubernetes/kubernetes/pull/62486/files
+	// https://github.com/kubernetes/kubernetes/issues/66323
+	//	https://github.com/kubernetes/kubernetes/pull/67280/files
+
+	glog.V(5).Infof(
+		"Mounted %s to %s(fstype: %s, options: %v)",
+		devicePath, targetPath, fsType, options)
+
 	return &csi.NodePublishVolumeResponse{}, nil
 }
 
@@ -228,23 +234,19 @@ func (ns *nodeServer) NodeUnpublishVolume(ctx context.Context, req *csi.NodeUnpu
 		return nil, status.Error(codes.NotFound, msg)
 	}
 
-	/*
-		notMnt, err := isLikelyNotMountPointDetach(targetPath)
-		if err != nil {
-			return nil, status.Error(codes.Internal, err.Error())
-		}
-	*/
-	notMnt := false
+	mounter := &mount.SafeFormatAndMount{
+		Interface: mount.New(""),
+		Exec:      utilexec.New(),
+	}
 
+	notMnt, err := mounter.IsLikelyNotMountPoint(targetPath)
 	if notMnt {
 		msg := fmt.Sprintf("Path %s not mounted", targetPath)
 		glog.V(3).Info(msg)
 		return nil, status.Errorf(codes.NotFound, msg)
 	}
-
-	mounter := &mount.SafeFormatAndMount{
-		Interface: mount.New(""),
-		Exec:      utilexec.New(),
+	if err != nil {
+		return nil, status.Errorf(codes.Internal, "failed to detect if volume is mounted: %v", err)
 	}
 
 	if err = mounter.Unmount(targetPath); err != nil {