diff --git a/BoardConfig.mk b/BoardConfig.mk
index a2bfc00..5686d18 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -39,19 +39,12 @@ TARGET_ARCH_VARIANT := armv8-a
 TARGET_CPU_ABI := arm64-v8a
 TARGET_CPU_ABI2 :=
 TARGET_CPU_VARIANT := cortex-a53
-
+TARGET_CPU_CORTEX_A53 := true
 TARGET_2ND_ARCH := arm
 TARGET_2ND_ARCH_VARIANT := armv7-a-neon
 TARGET_2ND_CPU_ABI := armeabi-v7a
 TARGET_2ND_CPU_ABI2 := armeabi
 TARGET_2ND_CPU_VARIANT := cortex-a53
-
-TARGET_CPU_CORTEX_A53 := true
-
-# TARGET_PREFER_32_BIT := true
-# TARGET_SUPPORTS_32_BIT_APPS := true
-# TARGET_SUPPORTS_64_BIT_APPS := true
-# TARGET_BOARD_SUFFIX := _64
 TARGET_USES_64_BIT_BINDER := true
 
 # Asserts
@@ -121,7 +114,6 @@ BOARD_HAVE_BLUETOOTH := true
 BOARD_HAVE_BLUETOOTH_QCOM := true
 
 # Camera
-# TARGET_CAMERASERVICE_CLOSES_NATIVE_HANDLES := true
 USE_DEVICE_SPECIFIC_CAMERA := true
 BOARD_QTI_CAMERA_32BIT_ONLY := true
 
@@ -174,8 +166,7 @@ TARGET_PROVIDES_LIBLIGHT := true
 DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/configs/manifest.xml
 DEVICE_MATRIX_FILE   := $(DEVICE_PATH)/configs/compatibility_matrix.xml
 
-PRODUCT_BOOT_JARS += telephony-ext
-
+# NFC
 NXP_CHIP_TYPE := PN551
 BOARD_NFC_HAL_SUFFIX := $(TARGET_BOARD_PLATFORM)
 
diff --git a/device.mk b/device.mk
index 4493b67..222a805 100644
--- a/device.mk
+++ b/device.mk
@@ -362,6 +362,9 @@ PRODUCT_PACKAGES += \
     ims-ext-common \
     telephony-ext
 
+PRODUCT_BOOT_JARS += \
+    telephony-ext
+
 # IMS
 PRODUCT_PACKAGES += \
 com.android.ims.rcsmanager
diff --git a/lineage.dependencies b/lineage.dependencies
deleted file mode 100644
index 41b42e6..0000000
--- a/lineage.dependencies
+++ /dev/null
@@ -1,3 +0,0 @@
-[
-
-]