diff --git a/products/common.mk b/products/common.mk
index ff87cdc..2b482fc 100644
--- a/products/common.mk
+++ b/products/common.mk
@@ -5,15 +5,6 @@
 
 PRODUCT_PACKAGES += ADWLauncher
 
-# Use edify for otapackage
-PRODUCT_SPECIFIC_DEFINES += TARGET_OTA_SCRIPT_MODE=edify
-
-# Include backuptool
-PRODUCT_SPECIFIC_DEFINES += TARGET_OTA_BACKUPTOOL=true
-
-# Display modversion in edify script.
-PRODUCT_SPECIFIC_DEFINES += TARGET_OTA_MODVER=true
-
 # Add ROMManager build property
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.config.ringtone=DonMessWivIt.ogg
@@ -96,8 +87,6 @@
 #ADDITIONAL_DEFAULT_PROPERTIES += ro.secure=0
 
 ifdef CYANOGEN_WITH_GOOGLE
-    PRODUCT_SPECIFIC_DEFINES += TARGET_OTA_BACKUPTOOL=false
-
     PRODUCT_COPY_FILES += \
         vendor/cyanogen/proprietary/CarHomeGoogle.apk:./system/app/CarHomeGoogle.apk \
         vendor/cyanogen/proprietary/CarHomeLauncher.apk:./system/app/CarHomeLauncher.apk \
diff --git a/products/cyanogen_bravo.mk b/products/cyanogen_bravo.mk
index 4fa8659..22b27f1 100644
--- a/products/cyanogen_bravo.mk
+++ b/products/cyanogen_bravo.mk
@@ -23,9 +23,6 @@
 # Extra Passion overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/bravo
 
-# Use a precompiled kernel until the merge with cm-kernel
-TARGET_PREBUILT_KERNEL = device/htc/bravo/kernel/kernel
-
 # Extra RIL settings
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.ril.enable.managed.roaming=1 \
diff --git a/products/cyanogen_dream_sapphire.mk b/products/cyanogen_dream_sapphire.mk
index 487f762..2f0bf9d 100644
--- a/products/cyanogen_dream_sapphire.mk
+++ b/products/cyanogen_dream_sapphire.mk
@@ -47,10 +47,7 @@
 endif
 
 # Use the audio profile hack
-WITH_DS_HTCACOUSTIC_HACK := true
-
-# Use Windows Media
-WITH_WINDOWS_MEDIA := true
+PRODUCT_SPECIFIC_DEFINES += WITH_DS_HTCACOUSTIC_HACK := true
 
 #
 # Copy DS specific prebuilt files
diff --git a/products/cyanogen_espresso.mk b/products/cyanogen_espresso.mk
index ae583d1..cb1fe81 100644
--- a/products/cyanogen_espresso.mk
+++ b/products/cyanogen_espresso.mk
@@ -19,9 +19,6 @@
 
 PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-espresso.map
 
-# Build Kernel
-PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/htc/espresso/kernel
-
 # Extra Espresso overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/espresso
 
diff --git a/products/cyanogen_hero.mk b/products/cyanogen_hero.mk
index d32d1de..13a3373 100644
--- a/products/cyanogen_hero.mk
+++ b/products/cyanogen_hero.mk
@@ -20,9 +20,6 @@
 # Enable Windows Media
 WITH_WINDOWS_MEDIA := true
 
-# Build Kernel
-PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/htc/hero/kernel
-
 #
 # Set ro.modversion
 #
diff --git a/products/cyanogen_heroc.mk b/products/cyanogen_heroc.mk
index 9676527..26cbd47 100644
--- a/products/cyanogen_heroc.mk
+++ b/products/cyanogen_heroc.mk
@@ -17,9 +17,6 @@
 PRODUCT_MANUFACTURER := HTC
 PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRF91 PRODUCT_NAME=passion BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2/FRF91/43546:user/release-keys TARGET_BUILD_TYPE=userdebug BUILD_VERSION_TAGS=release-keys PRIVATE_BUILD_DESC="heroc-user 2.2 FRF91 43546 release-keys"
 
-# Use Prebuilt kernel from heroC device tree
-PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/htc/heroc/kernel
-
 # Extra overlay for Gallery3D orientation hack
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/heroc
 
diff --git a/products/cyanogen_inc.mk b/products/cyanogen_inc.mk
index 6e68fbd..5846205 100644
--- a/products/cyanogen_inc.mk
+++ b/products/cyanogen_inc.mk
@@ -18,9 +18,6 @@
 # Extra Passion overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/passion
 
-# Build Kernel
-PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/htc/inc/kernel
-
 #
 # Set ro.modversion
 #
diff --git a/products/cyanogen_liberty.mk b/products/cyanogen_liberty.mk
index 75ecf5a..ec5c158 100644
--- a/products/cyanogen_liberty.mk
+++ b/products/cyanogen_liberty.mk
@@ -19,13 +19,6 @@
 
 PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-liberty.map
 
-# Build kernel
-PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/htc/liberty/kernel
-
-
-# Enable Windows Media
-WITH_WINDOWS_MEDIA := true
-
 #
 # Set ro.modversion
 #
diff --git a/products/cyanogen_passion.mk b/products/cyanogen_passion.mk
index e9b7c87..152a00e 100644
--- a/products/cyanogen_passion.mk
+++ b/products/cyanogen_passion.mk
@@ -34,9 +34,6 @@
     ro.ril.oem.nosim.ecclist=911,112,999,000,08,118,120,122,110,119,995 \
     ro.ril.emc.mode=2
 
-# Enable Windows Media
-WITH_WINDOWS_MEDIA := true
-
 #
 # Set ro.modversion
 #
diff --git a/products/cyanogen_sholes.mk b/products/cyanogen_sholes.mk
index c99886f..fdff2cd 100644
--- a/products/cyanogen_sholes.mk
+++ b/products/cyanogen_sholes.mk
@@ -13,9 +13,6 @@
 PRODUCT_MODEL := Droid
 PRODUCT_MANUFACTURER := Motorola
 
-# Build Kernel
-PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/motorola/sholes/kernel
-
 #
 # Set ro.modversion
 #
diff --git a/products/cyanogen_supersonic.mk b/products/cyanogen_supersonic.mk
index 598c765..fb17bb1 100644
--- a/products/cyanogen_supersonic.mk
+++ b/products/cyanogen_supersonic.mk
@@ -14,13 +14,6 @@
 PRODUCT_MANUFACTURER := HTC
 PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRF91 PRODUCT_NAME=htc_supersonic BUILD_FINGERPRINT=sprint/htc_supersonic/supersonic/supersonic:2.2/FRF91/218634:user/release-keys TARGET_BUILD_TYPE=userdebug BUILD_VERSION_TAGS=release-keys PRIVATE_BUILD_DESC="3.26.651.1 CL218634 release-keys"
 
-PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/htc/supersonic/kernel
-
-# Build kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_mahimahi_defconfig
-
 # Extra Supersonic overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/supersonic
 
diff --git a/products/cyanogen_vibrant.mk b/products/cyanogen_vibrant.mk
index 7869566..146eca5 100644
--- a/products/cyanogen_vibrant.mk
+++ b/products/cyanogen_vibrant.mk
@@ -20,16 +20,6 @@
 # Extra Vibrant overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/vibrant
 
-PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/vibrant/kernel
-
-# Build kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_smdkc110_defconfig
-
-# Enable Windows Media
-WITH_WINDOWS_MEDIA := true
-
 #
 # Set ro.modversion
 #