diff --git a/cluster/images/etcd-empty-dir-cleanup/Dockerfile b/cluster/images/etcd-empty-dir-cleanup/Dockerfile
deleted file mode 100644
index 37e2ebefb4e..00000000000
--- a/cluster/images/etcd-empty-dir-cleanup/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2016 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-FROM us.gcr.io/k8s-artifacts-prod/build-image/debian-base:v2.1.0
-
-COPY etcdctl etcd-empty-dir-cleanup.sh /
-RUN chmod a+rx /etcdctl /etcd-empty-dir-cleanup.sh
-
-ENV ETCDCTL /etcdctl
-ENV SLEEP_SECOND 3600
-
-USER nobody:nogroup
-
-ENTRYPOINT ["/etcd-empty-dir-cleanup.sh"]
diff --git a/cluster/images/etcd-empty-dir-cleanup/Makefile b/cluster/images/etcd-empty-dir-cleanup/Makefile
deleted file mode 100644
index 9caa5494d76..00000000000
--- a/cluster/images/etcd-empty-dir-cleanup/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2016 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-.PHONY:	build push
-
-ETCD_VERSION = 3.4.7
-# Image should be pulled from k8s.gcr.io, which will auto-detect
-# region (us, eu, asia, ...) and pull from the closest.
-REGISTRY = k8s.gcr.io
-# Images should be pushed to staging-k8s.gcr.io.
-PUSH_REGISTRY = staging-k8s.gcr.io
-TAG = 3.4.7.1
-
-clean:
-	rm -rf etcdctl etcd-v$(ETCD_VERSION)-linux-amd64 etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz
-
-build: clean
-	curl -L -O https://github.com/coreos/etcd/releases/download/v$(ETCD_VERSION)/etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz
-	tar xzvf etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz
-	cp etcd-v$(ETCD_VERSION)-linux-amd64/etcdctl .
-	docker build --pull -t $(REGISTRY)/etcd-empty-dir-cleanup:$(TAG) .
-	rm -rf etcdctl etcd-v$(ETCD_VERSION)-linux-amd64 etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz
-
-push: build
-	docker tag $(REGISTRY)/etcd-empty-dir-cleanup:$(TAG) $(PUSH_REGISTRY)/etcd-empty-dir-cleanup:$(TAG)
-	docker push $(PUSH_REGISTRY)/etcd-empty-dir-cleanup:$(TAG)
diff --git a/cluster/images/etcd-empty-dir-cleanup/OWNERS b/cluster/images/etcd-empty-dir-cleanup/OWNERS
deleted file mode 100644
index 3ea81fac109..00000000000
--- a/cluster/images/etcd-empty-dir-cleanup/OWNERS
+++ /dev/null
@@ -1,4 +0,0 @@
-# See the OWNERS docs at https://go.k8s.io/owners
-
-labels:
-- sig/api-machinery
diff --git a/cluster/images/etcd-empty-dir-cleanup/etcd-empty-dir-cleanup.sh b/cluster/images/etcd-empty-dir-cleanup/etcd-empty-dir-cleanup.sh
deleted file mode 100644
index 37da93f7e00..00000000000
--- a/cluster/images/etcd-empty-dir-cleanup/etcd-empty-dir-cleanup.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-# Copyright 2016 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-echo "Removing empty directories from etcd..."
-
-cleanup_empty_dirs () {
-  if [ "$("${ETCDCTL}" ls "${1}")" ]; then
-    for SUBDIR in $("${ETCDCTL}" ls -p "${1}" | grep "/$")
-    do
-      cleanup_empty_dirs "${SUBDIR}"
-    done
-  else
-    echo "Removing empty key $1 ..."
-    "${ETCDCTL}" rmdir "${1}"
-  fi
-}
-
-while true
-do
-  echo "Starting cleanup..."
-  cleanup_empty_dirs "/registry"
-  echo "Done with cleanup."
-  sleep "${SLEEP_SECOND}"
-done