diff --git a/BoardConfig.mk b/BoardConfig.mk
index af18927..3fb3526 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -102,4 +102,4 @@ BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := leo
 BOARD_VENDOR_QCOM_GPS_LOC_API_AMSS_VERSION := 3200
 
 TARGET_PREBUILT_RECOVERY_KERNEL := device/htc/leo/prebuilt/recovery_kernel
-TARGET_RECOVERY_INITRC := device/htc/leo/prebuilt/recovery/init.htc.rc
+-include device/htc/7x30-recovery/BoardConfigCommon.mk
diff --git a/leo.mk b/leo.mk
index 03d2d2f..323421f 100755
--- a/leo.mk
+++ b/leo.mk
@@ -88,14 +88,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
     vendor/cyanogen/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
 
-# recovery utilities
-PRODUCT_COPY_FILES += \
-    device/htc/leo/prebuilt/recovery/choice_fn:recovery/root/sbin/choice_fn \
-    device/htc/leo/prebuilt/recovery/detect_key:recovery/root/sbin/detect_key \
-    device/htc/leo/prebuilt/recovery/htcbatt:recovery/root/sbin/htcbatt \
-    device/htc/leo/prebuilt/recovery/offmode_charging:recovery/root/sbin/offmode_charging \
-    device/htc/leo/prebuilt/recovery/power_test:recovery/root/sbin/power_test
-
 # kernel modules
 PRODUCT_COPY_FILES += \
     device/htc/leo/prebuilt/modules/bcm4329.ko:system/lib/modules/bcm4329.ko \
diff --git a/prebuilt/recovery/choice_fn b/prebuilt/recovery/choice_fn
deleted file mode 100755
index aa79c0a..0000000
Binary files a/prebuilt/recovery/choice_fn and /dev/null differ
diff --git a/prebuilt/recovery/detect_key b/prebuilt/recovery/detect_key
deleted file mode 100755
index ebf5ec2..0000000
Binary files a/prebuilt/recovery/detect_key and /dev/null differ
diff --git a/prebuilt/recovery/htcbatt b/prebuilt/recovery/htcbatt
deleted file mode 100644
index d6ddec3..0000000
Binary files a/prebuilt/recovery/htcbatt and /dev/null differ
diff --git a/prebuilt/recovery/init.htc.rc b/prebuilt/recovery/init.htc.rc
deleted file mode 100644
index cf794ae..0000000
--- a/prebuilt/recovery/init.htc.rc
+++ /dev/null
@@ -1,59 +0,0 @@
-on early-init
-    start ueventd
-
-on init
-    export PATH /sbin
-    export ANDROID_ROOT /system
-    export ANDROID_DATA /data
-    export EXTERNAL_STORAGE /sdcard
-
-    symlink /system/etc /etc
-
-    mkdir /boot
-    mkdir /sdcard
-    mkdir /sd-ext
-    mkdir /datadata
-    mkdir /emmc
-    mkdir /system
-    mkdir /data
-    mkdir /cache
-    mount /tmp /tmp tmpfs
-
-on boot
-
-    ifup lo
-    hostname localhost
-    domainname localdomain
-
-    class_start default
-
-service ueventd /sbin/ueventd
-    critical
-
-service choice_fn /sbin/choice_fn
-    oneshot
-
-service recovery /sbin/recovery
-
-service power_test /sbin/power_test
-    disabled
-    oneshot
-
-service offmode_charging /sbin/offmode_charging
-    disabled
-    oneshot
-
-service detect_key /sbin/detect_key
-    disabled
-    oneshot
-
-service htcbatt /sbin/htcbatt
-    oneshot
-
-service adbd /sbin/adbd recovery
-
-on property:persist.service.adb.enable=1
-    start adbd
-
-on property:persist.service.adb.enable=0
-    stop adbd
diff --git a/prebuilt/recovery/offmode_charging b/prebuilt/recovery/offmode_charging
deleted file mode 100755
index 5937612..0000000
Binary files a/prebuilt/recovery/offmode_charging and /dev/null differ
diff --git a/prebuilt/recovery/power_test b/prebuilt/recovery/power_test
deleted file mode 100755
index 7cbb171..0000000
Binary files a/prebuilt/recovery/power_test and /dev/null differ