Clean up duplicated function etc after merge
Clean up duplicated function etc after merge

kubernetes/minikube,warmchang/minikube,warmchang/minikube,kubernetes/minikube,warmchang/minikube,warmchang/minikube,kubernetes/minikube,warmchang/minikube,warmchang/minikube,kubernetes/minikube,kubernetes/minikube,kubernetes/minikube,kubernetes/minikube,warmchang/minikube