diff --git a/cm.mk b/cm.mk
deleted file mode 100644
index ad56486..0000000
--- a/cm.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-$(call inherit-product, device/google/seedmtk/seedmtk.mk)
-
-# Common CM stuff
-$(call inherit-product, vendor/cm/config/common_full_phone.mk)
-
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_FINGERPRINT=6.0/MRA58M/2280749:user/release-keys PRIVATE_BUILD_DESC="sprout-user 6.0 MRA58M 2280749 release-keys"
-
-PRODUCT_NAME := cm_seedmtk
-PRODUCT_DEVICE :=seedmtk
-PRODUCT_BRAND := google
-PRODUCT_MANUFACTURER := Google
-PRODUCT_MODEL := Pixelv1
-
-PRODUCT_BUILD_PROP_OVERRIDES += \
-    PRODUCT_DEVICE="seedmtk"
diff --git a/rootdir/root/fstab.sprout b/rootdir/root/fstab.sprout
index 1a2689b..9ca1cd5 100644
--- a/rootdir/root/fstab.sprout
+++ b/rootdir/root/fstab.sprout
@@ -6,7 +6,6 @@
 /dev/block/platform/mtk-msdc.0/by-name/boot      /boot       emmc	defaults                                                    defaults
 /dev/block/platform/mtk-msdc.0/by-name/recovery  /recovery   emmc	defaults                                                    defaults
 /dev/block/platform/mtk-msdc.0/by-name/system    /system     ext4       ro                                                          wait
-/dev/block/platform/mtk-msdc.0/by-name/system    /system     squashfs   ro                                                          wait
 /dev/block/platform/mtk-msdc.0/by-name/userdata  /data       ext4       noatime,nosuid,nodev,noauto_da_alloc,discard                wait,check,encryptable=/dev/block/platform/mtk-msdc.0/by-name/metadata
 /dev/block/platform/mtk-msdc.0/by-name/cache     /cache      ext4       noatime,nosuid,nodev,noauto_da_alloc,discard                wait,check
 /dev/block/platform/mtk-msdc.0/by-name/protect1  /protect_f  ext4       noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc    wait,check,notrim
diff --git a/seedmtk.mk b/seedmtk.mk
index 9e955c8..6cc1638 100644
--- a/seedmtk.mk
+++ b/seedmtk.mk
@@ -17,10 +17,6 @@
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 
-#Hack for prebuilt kernel
-$(shell mkdir -p $(OUT)/obj/KERNEL_OBJ/usr)
-$(shell touch $(OUT)/obj/KERNEL_OBJ/usr/export_includes)
-
 # common sprout
 $(call inherit-product, device/google/sprout-common/sprout.mk)
 
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 7a4b7a7..948ae68 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,2 +1,2 @@
-add_lunch_combo cm_seedmtk-userdebug
-add_lunch_combo cm_seedmtk-eng
+add_lunch_combo xenonhd_seedmtk-userdebug
+add_lunch_combo xenonhd_seedmtk-eng