diff --git a/prebuilt/heroc/etc/apns-conf.xml b/prebuilt/heroc/etc/apns-conf.xml
deleted file mode 100644
index 4bcc9fc2..00000000
--- a/prebuilt/heroc/etc/apns-conf.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2006, Google Inc.
-**
-** 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.
-*/
-    apn carrier="CDMA"
-         mcc="310"
-         mnc="120"
-         apn="0"
-         port=""
-         mmsproxy=""
-         mmsport=""
-         mmsc=""
-         type="*"
-
--->
-
-<!-- use empty string to specify no proxy or port -->
-<!-- This version must agree with that in apps/common/res/apns.xml -->
-<apns version="6">
-    <apn carrier="CDMA"
-         mcc="310"
-         mnc="120"
-         apn="1"
-         port=""
-         mmsproxy=""
-         mmsport=""
-         mmsc="http://mms.sprintpcs.com"
-    />
-</apns>
diff --git a/prebuilt/heroc/etc/gps.conf b/prebuilt/heroc/etc/gps.conf
deleted file mode 100644
index f371e67e..00000000
--- a/prebuilt/heroc/etc/gps.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-NTP_SERVER=north-america.pool.ntp.org
-XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra.bin
-XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra.bin
-XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra.bin
-QOS_ACCURACY=16
diff --git a/prebuilt/heroc/media/bootanimation.zip b/prebuilt/heroc/media/bootanimation.zip
deleted file mode 100644
index 3afbfb74..00000000
Binary files a/prebuilt/heroc/media/bootanimation.zip and /dev/null differ
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 8ec1a2d0..21d28b69 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -2,7 +2,6 @@ PRODUCT_MAKEFILES := \
         $(LOCAL_DIR)/cyanogen_passion.mk \
         $(LOCAL_DIR)/cyanogen_inc.mk \
         $(LOCAL_DIR)/cyanogen_hero.mk \
-        $(LOCAL_DIR)/cyanogen_heroc.mk \
         $(LOCAL_DIR)/cyanogen_sholes.mk \
 	$(LOCAL_DIR)/cyanogen_dream_sapphire.mk \
 	$(LOCAL_DIR)/cyanogen_bravo.mk \
diff --git a/products/cyanogen_heroc.mk b/products/cyanogen_heroc.mk
deleted file mode 100644
index 696f9da0..00000000
--- a/products/cyanogen_heroc.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# Inherit AOSP device configuration for passion.
-#$(call inherit-product, device/htc/heroc/froyo_heroc.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_heroc
-PRODUCT_BRAND := htc
-PRODUCT_DEVICE := heroc
-PRODUCT_MODEL := Hero CDMA
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF83 BUILD_DISPLAY_ID=FRF83 PRODUCT_NAME=passion BUILD_FINGERPRINT=/passion/passion/mahimahi:2.2/FRF83/42295:user/release-keys
-PRIVATE_BUILD_DESC="passion-user 2.2 FRF83 42295 release-keys"
-
-#
-# Set ro.modversion
-#
-ifdef CYANOGEN_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-N1
-else
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.0.0-Heroc-test0
-endif
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/heroc/media/bootanimation.zip:system/media/bootanimation.zip\
-    vendor/cyanogen/prebuilt/heroc/etc/apns-conf.xml:system/etc/apns-conf.xml \
-    vendor/cyanogen/prebuilt/heroc/etc/gps.conf:system/etc/gps.conf 
diff --git a/vendorsetup.sh b/vendorsetup.sh
index d7406552..e7dcebcd 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,7 +1,6 @@
 add_lunch_combo cyanogen_passion-eng
 add_lunch_combo cyanogen_inc-eng
 add_lunch_combo cyanogen_hero-eng
-add_lunch_combo cyanogen_heroc-eng
 add_lunch_combo cyanogen_sholes-eng
 add_lunch_combo cyanogen_dream_sapphire-eng
 add_lunch_combo cyanogen_bravo-eng