diff --git a/pkg/volume/csi/csi_mounter.go b/pkg/volume/csi/csi_mounter.go
index eff955877bb..4c131695d4b 100644
--- a/pkg/volume/csi/csi_mounter.go
+++ b/pkg/volume/csi/csi_mounter.go
@@ -365,7 +365,9 @@ func (c *csiMountMgr) TearDownAt(dir string) error {
 		return errors.New(log("mounter.TearDownAt failed: %v", err))
 	}
 
-	// clean mount point dir
+	// Deprecation: Removal of this mount directory MUST be done by
+	// the CSI plugin according to the spec. This will no longer be done
+	// directly as part of TearDown by the kubelet in the future.
 	if err := removeMountDir(c.plugin, dir); err != nil {
 		return errors.New(log("mounter.TearDownAt failed to clean mount dir [%s]: %v", dir, err))
 	}
@@ -426,9 +428,6 @@ func removeMountDir(plug *csiPlugin, mountPath string) error {
 	}
 	if !mnt {
 		klog.V(4).Info(log("dir not mounted, deleting it [%s]", mountPath))
-		// Deprecation: Removal of this mountPath directory MUST be done by
-		// the CSI plugin according to the spec. This will no longer be done
-		// directly as part of TearDown by the kubelet in the future.
 		if err := os.Remove(mountPath); err != nil && !os.IsNotExist(err) {
 			return errors.New(log("failed to remove dir [%s]: %v", mountPath, err))
 		}