diff --git a/Android.mk b/Android.mk
index 15630f45..f9f2628a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -3,7 +3,3 @@
 ifdef CYANOGEN_WITH_GOOGLE
     PACKAGES.Email.OVERRIDES := Provision LatinIME QuickSearchBox
 endif
-
-ifndef DEFAULT_LAUNCHER
-    PACKAGES.ADWLauncher.OVERRIDES := Launcher Launcher2
-endif
\ No newline at end of file
diff --git a/products/common.mk b/products/common.mk
index cb41c2ac..9573a256 100644
--- a/products/common.mk
+++ b/products/common.mk
@@ -57,7 +57,6 @@ include frameworks/base/data/sounds/AudioPackage4.mk
 
 PRODUCT_COPY_FILES += \
     vendor/cyanogen/prebuilt/common/bin/backuptool.sh:system/bin/backuptool.sh \
-    vendor/cyanogen/prebuilt/common/lib/libncurses.so:system/lib/libncurses.so \
     vendor/cyanogen/prebuilt/common/etc/resolv.conf:system/etc/resolv.conf \
     vendor/cyanogen/prebuilt/common/etc/sysctl.conf:system/etc/sysctl.conf \
     vendor/cyanogen/prebuilt/common/etc/terminfo/l/linux:system/etc/terminfo/l/linux \
@@ -71,11 +70,9 @@ PRODUCT_COPY_FILES += \
     vendor/cyanogen/prebuilt/common/etc/init.d/20userinit:system/etc/init.d/20userinit \
     vendor/cyanogen/prebuilt/common/bin/compcache:system/bin/compcache \
     vendor/cyanogen/prebuilt/common/bin/fix_permissions:system/bin/fix_permissions \
-    vendor/cyanogen/prebuilt/common/xbin/bash:system/xbin/bash \
     vendor/cyanogen/prebuilt/common/xbin/htop:system/xbin/htop \
     vendor/cyanogen/prebuilt/common/xbin/irssi:system/xbin/irssi \
     vendor/cyanogen/prebuilt/common/xbin/lsof:system/xbin/lsof \
-    vendor/cyanogen/prebuilt/common/xbin/nano:system/xbin/nano \
     vendor/cyanogen/prebuilt/common/xbin/powertop:system/xbin/powertop \
     vendor/cyanogen/prebuilt/common/xbin/openvpn-up.sh:system/xbin/openvpn-up.sh
 
diff --git a/products/cyanogen_sholes.mk b/products/cyanogen_sholes.mk
index a028e781..6b308198 100644
--- a/products/cyanogen_sholes.mk
+++ b/products/cyanogen_sholes.mk
@@ -26,7 +26,7 @@ ifdef CYANOGEN_NIGHTLY
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Droid
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.0.0-Droid-alpha3
+        ro.modversion=CyanogenMod-6.0.0-Droid-alpha4
 endif
 
 PRODUCT_BUILD_PROP_OVERRIDES := BUILD_ID=FRF84B BUILD_DISPLAY_ID=FRF84B PRODUCT_NAME=voles TARGET_DEVICE=sholes BUILD_FINGERPRINT=verizon/voles/sholes/sholes:2.2/FRF84B/42477:user/release-keys PRODUCT_BRAND=verizon PRIVATE_BUILD_DESC="voles-user 2.2 FRF84B 42477 release-keys" BUILD_NUMBER=42477 BUILD_UTC_DATE=1277333704 TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys USER=android-build