diff --git a/cmd/minikube/cmd/node_delete.go b/cmd/minikube/cmd/node_delete.go
index f4cb3c6c012400bc0d07d27f3e486869f7270f8e..0241631b887682783633106ccd3d04ac6e302160 100644
--- a/cmd/minikube/cmd/node_delete.go
+++ b/cmd/minikube/cmd/node_delete.go
@@ -17,6 +17,7 @@ limitations under the License.
 package cmd
 
 import (
+	"github.com/golang/glog"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/minikube/cluster"
@@ -24,6 +25,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/machine"
 	"k8s.io/minikube/pkg/minikube/node"
+	"k8s.io/minikube/pkg/minikube/out"
 )
 
 var nodeDeleteCmd = &cobra.Command{
@@ -53,10 +55,16 @@ var nodeDeleteCmd = &cobra.Command{
 		}
 
 		if cluster.IsHostRunning(api, name) {
-			node.Stop(cc, n)
+			err := node.Stop(cc, n)
+			if err != nil {
+				glog.Warningf("Failed to stop node, will still try to delete")
+			}
 		}
 
-		node.Delete(cc, name)
+		err = node.Delete(cc, name)
+		if err != nil {
+			out.FatalT("Failed to delete node {{.name}}", out.V{"name": name})
+		}
 	},
 }
 
diff --git a/cmd/minikube/cmd/node_start.go b/cmd/minikube/cmd/node_start.go
index a134946172f090287633acab965fdb3d79065a63..3dbb0c5040c1767f0395d51ae845e6a57655ef74 100644
--- a/cmd/minikube/cmd/node_start.go
+++ b/cmd/minikube/cmd/node_start.go
@@ -61,7 +61,10 @@ var nodeStartCmd = &cobra.Command{
 		}
 
 		// Start it up baby
-		node.Start(cc, n, false, nil)
+		_, err = node.Start(cc, n, false, nil)
+		if err != nil {
+			out.FatalT("Failed to start node {{.name}}", out.V{"name": name})
+		}
 	},
 }
 
diff --git a/cmd/minikube/cmd/node_stop.go b/cmd/minikube/cmd/node_stop.go
index 275e3ffbf864d02aefb27b65458901778f9e1e7c..37d7d1499b8e838b13296a24644c4ab3a8d353e9 100644
--- a/cmd/minikube/cmd/node_stop.go
+++ b/cmd/minikube/cmd/node_stop.go
@@ -59,7 +59,10 @@ var nodeStopCmd = &cobra.Command{
 			exit.WithError("retrieving node", err)
 		}
 
-		node.Stop(cc, n)
+		err = node.Stop(cc, n)
+		if err != nil {
+			out.FatalT("Failed to stop node {{.name}}", out.V{"name": name})
+		}
 	},
 }
 
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 79d4d6a1db2ee8060c7678eaa362b428a26078f5..cdac3208a01a9b422da49141093a7672fa20a1d5 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -942,8 +942,3 @@ func getKubernetesVersion(old *config.MachineConfig) string {
 	}
 	return nv
 }
-
-// saveConfig saves profile cluster configuration in $MINIKUBE_HOME/profiles/<profilename>/config.json
-func saveConfig(clusterCfg *config.MachineConfig) error {
-	return config.SaveProfile(viper.GetString(config.MachineProfile), clusterCfg)
-}
diff --git a/pkg/minikube/cluster/cluster_test.go b/pkg/minikube/cluster/cluster_test.go
index 6931c64da880cf6e2d77f9e1f578ad6667a6512f..3327441278a635ed8fa045ce176d962bb9dc81d6 100644
--- a/pkg/minikube/cluster/cluster_test.go
+++ b/pkg/minikube/cluster/cluster_test.go
@@ -61,7 +61,7 @@ func RegisterMockDriver(t *testing.T) {
 }
 
 var defaultMachineConfig = config.MachineConfig{
-	Driver:    driver.Mock,
+	Driver:      driver.Mock,
 	MinikubeISO: constants.DefaultISOURL,
 	Downloader:  MockDownloader{},
 	DockerEnv:   []string{"MOCK_MAKE_IT_PROVISION=true"},
@@ -262,7 +262,7 @@ func TestStartHostConfig(t *testing.T) {
 	provision.SetDetector(md)
 
 	config := config.MachineConfig{
-		Driver:   driver.Mock,
+		Driver:     driver.Mock,
 		DockerEnv:  []string{"FOO=BAR"},
 		DockerOpt:  []string{"param=value"},
 		Downloader: MockDownloader{},
diff --git a/pkg/minikube/cluster/fix.go b/pkg/minikube/cluster/fix.go
index 317dca85914133126132a7a038ed9c6658e546b5..be15f59d9345d1a1a140169cd630d67e364b86db 100644
--- a/pkg/minikube/cluster/fix.go
+++ b/pkg/minikube/cluster/fix.go
@@ -198,8 +198,8 @@ func adjustGuestClock(h hostRunner, t time.Time) error {
 
 // machineExists checks if virtual machine does not exist
 // if the virtual machine exists, return true
-func machineExists(Driver string, s state.State, err error) (bool, error) {
-	switch Driver {
+func machineExists(d string, s state.State, err error) (bool, error) {
+	switch d {
 	case driver.HyperKit:
 		if s == state.Stopped || err.Error() == "connection is shut down" {
 			return false, ErrorMachineNotExist
diff --git a/pkg/minikube/node/node.go b/pkg/minikube/node/node.go
index 6cbde5057a07b9a13cf2b2b995f3d9a7416291d1..0c0c4695e8c20712bdb831706bb5d50a3e7f3a8e 100644
--- a/pkg/minikube/node/node.go
+++ b/pkg/minikube/node/node.go
@@ -26,7 +26,6 @@ import (
 
 const (
 	imageRepository     = "image-repository"
-	force               = "force"
 	cacheImages         = "cache-images"
 	waitUntilHealthy    = "wait"
 	cacheImageConfigKey = "cache"