diff --git a/staging/src/k8s.io/client-go/util/clock/BUILD b/staging/src/k8s.io/apimachinery/pkg/util/clock/BUILD
similarity index 100%
rename from staging/src/k8s.io/client-go/util/clock/BUILD
rename to staging/src/k8s.io/apimachinery/pkg/util/clock/BUILD
diff --git a/staging/src/k8s.io/client-go/util/clock/clock.go b/staging/src/k8s.io/apimachinery/pkg/util/clock/clock.go
similarity index 100%
rename from staging/src/k8s.io/client-go/util/clock/clock.go
rename to staging/src/k8s.io/apimachinery/pkg/util/clock/clock.go
diff --git a/staging/src/k8s.io/client-go/util/clock/clock_test.go b/staging/src/k8s.io/apimachinery/pkg/util/clock/clock_test.go
similarity index 100%
rename from staging/src/k8s.io/client-go/util/clock/clock_test.go
rename to staging/src/k8s.io/apimachinery/pkg/util/clock/clock_test.go
diff --git a/staging/src/k8s.io/apiserver/pkg/util/cache/BUILD b/staging/src/k8s.io/apiserver/pkg/util/cache/BUILD
deleted file mode 100644
index 16908b0a747..00000000000
--- a/staging/src/k8s.io/apiserver/pkg/util/cache/BUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_library",
-    "go_test",
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = [
-        "cache_test.go",
-        "lruexpirecache_test.go",
-    ],
-    library = ":go_default_library",
-    tags = ["automanaged"],
-    deps = [
-        "//vendor/github.com/golang/groupcache/lru:go_default_library",
-        "//vendor/k8s.io/client-go/util/clock:go_default_library",
-    ],
-)
-
-go_library(
-    name = "go_default_library",
-    srcs = [
-        "cache.go",
-        "lruexpirecache.go",
-    ],
-    tags = ["automanaged"],
-    deps = ["//vendor/github.com/golang/groupcache/lru:go_default_library"],
-)