diff --git a/BoardConfig.mk b/BoardConfig.mk
index 87b1494..3ab6055 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -42,11 +42,6 @@ DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/manifest.xml
 # Security patch level
 VENDOR_SECURITY_PATCH := 2018-10-01
 
-# Custom Bootimg for prebuilt kernel
-BOARD_CUSTOM_BOOTIMG := true
-BOARD_CUSTOM_BOOTIMG_MK := $(DEVICE_PATH)/mkbootimg.mk
-
 # Kernel
-TARGET_KERNEL_SOURCE := kernel/xiaomi/sdm660
+TARGET_KERNEL_SOURCE := kernel/xiaomi/clover
 TARGET_KERNEL_CONFIG := clover-perf_defconfig
-TARGET_PREBUILT_KERNEL := $(DEVICE_PATH)/prebuilt/Image.gz-dtb
diff --git a/device.mk b/device.mk
index da530bb..80ca578 100644
--- a/device.mk
+++ b/device.mk
@@ -88,15 +88,6 @@ PRODUCT_COPY_FILES += \
     $(DEVICE_PATH)/media/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \
     $(DEVICE_PATH)/media/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml
 
-# Prebuilt kernel
-PRODUCT_COPY_FILES += \
-    $(DEVICE_PATH)/prebuilt/Image.gz-dtb:kernel
-
-# Prebuilt modules
-PRODUCT_COPY_FILES += \
-    $(DEVICE_PATH)/prebuilt/exfat.ko:system/lib/modules/exfat.ko \
-    $(DEVICE_PATH)/prebuilt/qca_cld3_wlan.ko:system/lib/modules/qca_cld3_wlan.ko 
- 
 # Ramdisk
 PRODUCT_PACKAGES += \
     init.class_main.sh \
diff --git a/mkbootimg.mk b/mkbootimg.mk
deleted file mode 100644
index d2f20b2..0000000
--- a/mkbootimg.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Copyright (C) 2018 CarbonROM
-#
-# 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.
-
-#
-# This file sets variables that control the way modules are built
-# thorughout the system. It should not be used to conditionally
-# disable makefiles (the proper mechanism to control what gets
-# included in a build is to use PRODUCT_PACKAGES in a product
-# definition file).
-#
-
-
-NEW_BOOTIMAGE_ARGS := $(subst --kernel $(INSTALLED_KERNEL_TARGET),--kernel $(TARGET_PREBUILT_KERNEL),$(INTERNAL_BOOTIMAGE_ARGS))
-NEW_RECOVERYIMAGE_ARGS := $(subst --kernel $(recovery_kernel),--kernel $(TARGET_PREBUILT_KERNEL),$(INTERNAL_RECOVERYIMAGE_ARGS))
-
-$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES)
-	$(call pretty,"Target boot image: $@")
-	$(hide) $(MKBOOTIMG) $(NEW_BOOTIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $@
-	$(hide) $(call assert-max-image-size,$@,$(BOARD_BOOTIMAGE_PARTITION_SIZE),raw)
-	@echo "Made boot image: $@"
-
-$(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTIMG) $(recovery_ramdisk) $(recovery_kernel)
-	@echo "----- Making recovery image ------"
-	$(hide) $(MKBOOTIMG) $(NEW_RECOVERYIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $@ --id > $(RECOVERYIMAGE_ID_FILE)
-	$(hide) $(call assert-max-image-size,$@,$(BOARD_RECOVERYIMAGE_PARTITION_SIZE),raw)
-	@echo "Made recovery image: $@"
diff --git a/prebuilt/Image.gz-dtb b/prebuilt/Image.gz-dtb
deleted file mode 100644
index ce5ed96..0000000
Binary files a/prebuilt/Image.gz-dtb and /dev/null differ
diff --git a/prebuilt/exfat.ko b/prebuilt/exfat.ko
deleted file mode 100644
index ce67216..0000000
Binary files a/prebuilt/exfat.ko and /dev/null differ
diff --git a/prebuilt/qca_cld3_wlan.ko b/prebuilt/qca_cld3_wlan.ko
deleted file mode 100755
index e6e4ad5..0000000
Binary files a/prebuilt/qca_cld3_wlan.ko and /dev/null differ
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 4573c37..06bc53c 100755
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -54,7 +54,6 @@ on init
 
 on post-fs
     chmod 0755 /sys/kernel/debug/tracing
-    insmod /system/lib/modules/exfat.ko
 
 on early-boot
     # set RLIMIT_MEMLOCK to 64MB
diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc
index 164b10a..6020fe5 100755
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@@ -134,10 +134,7 @@ on boot
 
     # wendell-20180423 end
     start getpersistlog
-    
-#Load WLAN driver
-    insmod /system/lib/modules/qca_cld3_wlan.ko
-    setprop wlan.driver.status "ok"
+
     # Wifi firmware reload path
     chown wifi wifi /sys/module/wlan/parameters/fwpath