diff --git a/pkg/validation/BUILD.bazel b/pkg/validation/BUILD.bazel
index 6d87b70731..7a65cdc9b6 100644
--- a/pkg/validation/BUILD.bazel
+++ b/pkg/validation/BUILD.bazel
@@ -11,7 +11,6 @@ go_library(
     deps = [
         "//pkg/apis/kops:go_default_library",
         "//pkg/apis/kops/util:go_default_library",
-        "//upup/pkg/fi:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
diff --git a/upup/pkg/fi/cloudup/openstack/BUILD.bazel b/upup/pkg/fi/cloudup/openstack/BUILD.bazel
index b1a85bd414..4815be62a4 100644
--- a/upup/pkg/fi/cloudup/openstack/BUILD.bazel
+++ b/upup/pkg/fi/cloudup/openstack/BUILD.bazel
@@ -21,5 +21,6 @@ go_library(
         "//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/groups:go_default_library",
         "//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/rules:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
     ],
 )
diff --git a/upup/pkg/fi/nodeup/BUILD.bazel b/upup/pkg/fi/nodeup/BUILD.bazel
index a04f74f33d..5fc3260130 100644
--- a/upup/pkg/fi/nodeup/BUILD.bazel
+++ b/upup/pkg/fi/nodeup/BUILD.bazel
@@ -5,7 +5,6 @@ go_library(
     srcs = [
         "command.go",
         "loader.go",
-        "template_functions.go",
     ],
     importpath = "k8s.io/kops/upup/pkg/fi/nodeup",
     visibility = ["//visibility:public"],
@@ -16,7 +15,6 @@ go_library(
         "//pkg/apis/kops/registry:go_default_library",
         "//pkg/apis/nodeup:go_default_library",
         "//pkg/assets:go_default_library",
-        "//pkg/flagbuilder:go_default_library",
         "//upup/pkg/fi:go_default_library",
         "//upup/pkg/fi/loader:go_default_library",
         "//upup/pkg/fi/nodeup/cloudinit:go_default_library",