diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/buildhost-depends/buildhost-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/buildhost-depends/buildhost-depends-0.0.1.ebuild
deleted file mode 100644
index 3d0013803a..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/buildhost-depends/buildhost-depends-0.0.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2013 The CoreOS Authors
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-DESCRIPTION="Meta ebuild for everything that should be on build hosts."
-HOMEPAGE="http://coreos.com/docs/sdk/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="
-	coreos-devel/coreos-buildbot
-	coreos-devel/sdk-depends
-	dev-util/buildbot-slave
-	dev-util/catalyst[ccache]
-	"
-RDEPEND="${DEPEND}"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/coreos-buildbot/coreos-buildbot-0.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/coreos-buildbot/coreos-buildbot-0.0.1-r1.ebuild
deleted file mode 120000
index 189cec4c89..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/coreos-buildbot/coreos-buildbot-0.0.1-r1.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-coreos-buildbot-0.0.1.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/coreos-buildbot/coreos-buildbot-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/coreos-buildbot/coreos-buildbot-0.0.1.ebuild
deleted file mode 100644
index aab741acf0..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/coreos-buildbot/coreos-buildbot-0.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2013 The CoreOS Authors.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-CROS_WORKON_COMMIT="3e4b20f67839aa541839eca6b4b7274d5ad1932c"
-CROS_WORKON_PROJECT="coreos/coreos-buildbot"
-CROS_WORKON_REPO="git://github.com"
-
-inherit cros-workon distutils-r1
-
-DESCRIPTION="Tools and modules for CoreOS BuildBots"
-HOMEPAGE="https://github.com/coreos/coreos-buildbot"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pyflakes[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/twisted-core
-	dev-util/buildbot
-	"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-python_test() {
-	# Note: Current stable versions of twisted don't use the python-r1 eclass
-	# but there is some special magic in the trial wrapper to use the right
-	# python version based on EPYTHON which is exported by python-r1.
-	trial coreos || die
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/buildhost-depends-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/buildhost-depends-0.0.1
deleted file mode 100644
index cd1e55186f..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/buildhost-depends-0.0.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=coreos-devel/coreos-buildbot coreos-devel/sdk-depends dev-util/buildbot-slave dev-util/catalyst[ccache]
-DESCRIPTION=Meta ebuild for everything that should be on build hosts.
-EAPI=5
-HOMEPAGE=http://coreos.com/docs/sdk/
-KEYWORDS=amd64
-LICENSE=GPL-2
-RDEPEND=coreos-devel/coreos-buildbot coreos-devel/sdk-depends dev-util/buildbot-slave dev-util/catalyst[ccache]
-SLOT=0
-_md5_=88cbe5e77ffdd58d90e038be80c6e333
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/coreos-buildbot-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/coreos-buildbot-0.0.1
deleted file mode 100644
index 4c10f79b03..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/coreos-buildbot-0.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure info install prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyflakes[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-core dev-util/buildbot dev-vcs/git python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Tools and modules for CoreOS BuildBots
-EAPI=5
-HOMEPAGE=https://github.com/coreos/coreos-buildbot
-IUSE=cros_workon_tree_* profiling python_targets_python2_7
-KEYWORDS=amd64
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyflakes[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-core dev-util/buildbot python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	git-2	2027b81a576527fa16bece425941e094	git-r3	6ebae45064cb04482f3c702632dd9528	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=342565ca9b5f1061b51f9aef4b26e0e8
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/coreos-buildbot-0.0.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/coreos-buildbot-0.0.1-r1
deleted file mode 100644
index 4c10f79b03..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/coreos-buildbot-0.0.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure info install prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyflakes[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-core dev-util/buildbot dev-vcs/git python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Tools and modules for CoreOS BuildBots
-EAPI=5
-HOMEPAGE=https://github.com/coreos/coreos-buildbot
-IUSE=cros_workon_tree_* profiling python_targets_python2_7
-KEYWORDS=amd64
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyflakes[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-core dev-util/buildbot python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	git-2	2027b81a576527fa16bece425941e094	git-r3	6ebae45064cb04482f3c702632dd9528	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=342565ca9b5f1061b51f9aef4b26e0e8