diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-testutils/cros-testutils-0.0.1-r210.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-testutils/cros-testutils-0.0.1-r210.ebuild
deleted file mode 100644
index ab7027f0e4..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-testutils/cros-testutils-0.0.1-r210.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-CROS_WORKON_COMMIT="1bf718b912cf8ea5dcbf25f04a9ef9a9204f83d1"
-CROS_WORKON_TREE="7b1191682d8df182503e2c2ee948c0ecb48c5461"
-CROS_WORKON_PROJECT="chromiumos/platform/crostestutils"
-
-inherit cros-workon
-
-DESCRIPTION="Host test utilities for ChromiumOS"
-HOMEPAGE="http://www.chromium.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-
-CROS_WORKON_LOCALNAME="crostestutils"
-
-
-RDEPEND="app-emulation/qemu
- app-portage/gentoolkit
- app-shells/bash
- coreos-base/cros-devutils
- dev-util/crosutils
- "
-
-# These are all either bash / python scripts. No actual builds DEPS.
-DEPEND=""
-
-# Use default src_compile and src_install which use Makefile.
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-testutils/cros-testutils-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-testutils/cros-testutils-9999.ebuild
deleted file mode 100644
index d932786448..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-testutils/cros-testutils-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-CROS_WORKON_PROJECT="chromiumos/platform/crostestutils"
-
-inherit cros-workon
-
-DESCRIPTION="Host test utilities for ChromiumOS"
-HOMEPAGE="http://www.chromium.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-CROS_WORKON_LOCALNAME="crostestutils"
-
-
-RDEPEND="app-emulation/qemu
- app-portage/gentoolkit
- app-shells/bash
- coreos-base/cros-devutils
- dev-util/crosutils
- "
-
-# These are all either bash / python scripts. No actual builds DEPS.
-DEPEND=""
-
-# Use default src_compile and src_install which use Makefile.
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-testutils/metadata.xml b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-testutils/metadata.xml
deleted file mode 100644
index 097975e3ad..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-testutils/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r182.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r183.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r182.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r183.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild
index 977ad3f33e..ab3f8fafaa 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild
@@ -37,7 +37,6 @@ RDEPEND="${RDEPEND}
app-emulation/qemu
app-text/texi2html
coreos-base/cros-devutils[cros_host]
- coreos-base/cros-testutils
=dev-lang/python-2*
dev-python/setuptools
dev-lang/nasm
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/protofiles/files/policy_reader b/sdk_container/src/third_party/coreos-overlay/coreos-base/protofiles/files/policy_reader
deleted file mode 100755
index c0b1fad67a..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/protofiles/files/policy_reader
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-TMP_DIR="/tmp"
-PROTO_DIR="/usr/local/share/protofiles"
-PROTO_FILE="/var/lib/whitelist/policy"
-
-# Extracts a field from the protobuf and unescapes it. This function takes two
-# parameters: $1 is the field name without a trailing colon and $2 is the file
-# where the input data is. This file must be in $TMP_DIR. The output is the
-# raw unsecaped string.
-function extract_protobuf_field() {
- protobuf_field=$(grep "$1:" "$TMP_DIR/$2" | \
- sed "s/^$1: \"\(.*\)\"$/\1/;s/%/%%/g")
- printf "$protobuf_field"
-}
-
-# Decodes the policy blob and prints it to the screen.
-function decode_policy() {
- # Decode the wrapper protobuf.
- protoc --decode=enterprise_management.PolicyFetchResponse \
- -I "$PROTO_DIR" \
- "$PROTO_DIR/device_management_backend.proto" > \
- "$TMP_DIR/decoded_policy_response"
-
- # Decode the payload protobuf.
- extract_protobuf_field "policy_data" "decoded_policy_response" | \
- protoc --decode=enterprise_management.PolicyData \
- -I "$PROTO_DIR" \
- "$PROTO_DIR/device_management_backend.proto" > \
- "$TMP_DIR/policy_response_payload"
-
- # And the wrapped device policy data interpreted as device policy.
- extract_protobuf_field "policy_value" "policy_response_payload" | \
- protoc --decode=enterprise_management.ChromeDeviceSettingsProto \
- -I "$PROTO_DIR" \
- "$PROTO_DIR/chrome_device_policy.proto"
-
- rm "$TMP_DIR/decoded_policy_response" "$TMP_DIR/policy_response_payload"
-}
-
-cat "$PROTO_FILE" | decode_policy
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/protofiles/metadata.xml b/sdk_container/src/third_party/coreos-overlay/coreos-base/protofiles/metadata.xml
deleted file mode 100644
index 097975e3ad..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/protofiles/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/protofiles/protofiles-0.0.1-r11.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/protofiles/protofiles-0.0.1-r11.ebuild
deleted file mode 100644
index 8241be7488..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/protofiles/protofiles-0.0.1-r11.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-# This project checks out the proto files from the read only repository
-# linked to the src/chrome/browser/policy/proto directory of the Chromium
-# project. It is not cros-work-able if changes to the protobufs are needed
-# these should be done in the Chromium repository.
-
-EGIT_REPO_SERVER="https://chromium.googlesource.com"
-EGIT_REPO_URI="${EGIT_REPO_SERVER}/chromium/src/chrome/browser/policy/proto.git"
-EGIT_PROJECT="proto"
-EGIT_COMMIT="18f481b411ea0a861f0879af2065effce0e1fe6c"
-
-inherit git
-
-DESCRIPTION="Protobuf installer for the device policy proto definitions."
-HOMEPAGE="http://chromium.org"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-
-DEPEND="!<=chromeos-base/chromeos-chrome-16.0.886.0_rc-r1
- !=chromeos-base/chromeos-chrome-16.0.882.0_alpha-r1"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- cp "${FILESDIR}"/policy_reader "${S}"
-}
-
-src_install() {
- insinto /usr/include/proto
- doins "${S}"/*.proto || die "Can not install protobuf files."
- insinto /usr/share/protofiles
- doins "${S}"/chrome_device_policy.proto
- doins "${S}"/device_management_backend.proto
- dobin "${S}"/policy_reader
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/hard-host-depends-bsp/hard-host-depends-bsp-1.ebuild b/sdk_container/src/third_party/coreos-overlay/virtual/hard-host-depends-bsp/hard-host-depends-bsp-1.ebuild
deleted file mode 100644
index 3cb607a114..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/virtual/hard-host-depends-bsp/hard-host-depends-bsp-1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Host dependencies BSP virtual package. Override this virtual
-package in a private host overlay by adding a virtual/hard-host-depends-bsp
-version 2 ebuild, and have that package RDEPEND on any host dependencies needed
-by the private overlay."
-HOMEPAGE="http://src.chromium.org"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/hard-host-depends-bsp/metadata.xml b/sdk_container/src/third_party/coreos-overlay/virtual/hard-host-depends-bsp/metadata.xml
deleted file mode 100644
index 097975e3ad..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/virtual/hard-host-depends-bsp/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/modemmanager/metadata.xml b/sdk_container/src/third_party/coreos-overlay/virtual/modemmanager/metadata.xml
deleted file mode 100644
index 097975e3ad..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/virtual/modemmanager/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/modemmanager/modemmanager-1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/virtual/modemmanager/modemmanager-1-r2.ebuild
deleted file mode 120000
index 4a36547ba1..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/virtual/modemmanager/modemmanager-1-r2.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-modemmanager-1.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/modemmanager/modemmanager-1.ebuild b/sdk_container/src/third_party/coreos-overlay/virtual/modemmanager/modemmanager-1.ebuild
deleted file mode 100644
index 3f2b29cbfd..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/virtual/modemmanager/modemmanager-1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Chrome OS virtual ModemManager package"
-HOMEPAGE="http://src.chromium.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="+modemmanager_next"
-
-# TODO(benchan): Remove this virtual package once there is no need to switch
-# back to modemmanager.
-DEPEND="
- modemmanager_next? (
- net-misc/modemmanager-next
- net-misc/modemmanager-classic-interfaces
- !net-misc/modemmanager
- !net-misc/modemmanager-next-interfaces
- )
- !modemmanager_next? (
- !net-misc/modemmanager-next
- !net-misc/modemmanager-classic-interfaces
- net-misc/modemmanager
- net-misc/modemmanager-next-interfaces
- )
-"
-RDEPEND="${DEPEND}"
diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/opengles/metadata.xml b/sdk_container/src/third_party/coreos-overlay/virtual/opengles/metadata.xml
deleted file mode 100644
index 097975e3ad..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/virtual/opengles/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/opengles/opengles-1.ebuild b/sdk_container/src/third_party/coreos-overlay/virtual/opengles/opengles-1.ebuild
deleted file mode 100644
index aa1f6893b5..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/virtual/opengles/opengles-1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Virtual for OpenGLES implementations"
-SRC_URI=""
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-drivers/opengles"
-DEPEND=""