diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 8f56492..2200be8 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -71,9 +71,7 @@ TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/config.fs
 BOARD_HAVE_QCOM_FM := true
 
 # HIDL
-DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
-    $(COMMON_PATH)/device_framework_matrix.xml \
-    $(COMMON_PATH)/lineage_device_framework_matrix.xml
+DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := $(COMMON_PATH)/device_framework_matrix.xml
 DEVICE_MATRIX_FILE := $(COMMON_PATH)/compatibility_matrix.xml
 DEVICE_MANIFEST_FILE := $(COMMON_PATH)/manifest.xml
 
diff --git a/aosp.dependencies b/aosp.dependencies
new file mode 100644
index 0000000..9d9022a
--- /dev/null
+++ b/aosp.dependencies
@@ -0,0 +1,18 @@
+[
+  {
+    "repository": "hardware_xiaomi",
+    "target_path": "hardware/xiaomi",
+    "remote": "pixel"
+  },
+  {
+    "repository": "LineageOS/android_kernel_xiaomi_sm6250",
+    "target_path": "kernel/xiaomi/sm6250",
+    "branch": "lineage-18.1",
+    "remote": "github"
+  },
+  {
+    "repository": "vendor_xiaomi_sm6250-common",
+    "target_path": "vendor/xiaomi/sm6250-common",
+    "remote": "pixel-devices-blobs"
+  }
+]
diff --git a/atoll.mk b/atoll.mk
index 8854933..753938d 100644
--- a/atoll.mk
+++ b/atoll.mk
@@ -9,8 +9,7 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true
 
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += \
-    $(LOCAL_PATH)/overlay \
-    $(LOCAL_PATH)/overlay-lineage
+    $(LOCAL_PATH)/overlay
 
 PRODUCT_ENFORCE_RRO_TARGETS := *
 
@@ -213,10 +212,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.light-service.xiaomi
 
-# LiveDisplay
-PRODUCT_PACKAGES += \
-    vendor.lineage.livedisplay@2.0-service-sdm
-
 # Media
 PRODUCT_PACKAGES += \
     libavservices_minijail \
@@ -396,10 +391,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/thermal_info_config.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json
 
-# Trust
-PRODUCT_PACKAGES += \
-    vendor.lineage.trust@1.0-service
-
 # USB
 PRODUCT_PACKAGES += \
     android.hardware.usb@1.0-service
diff --git a/lineage.dependencies b/lineage.dependencies
deleted file mode 100644
index 1ba15db..0000000
--- a/lineage.dependencies
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "repository": "android_hardware_xiaomi",
-    "target_path": "hardware/xiaomi"
-  },
-  {
-    "repository": "android_kernel_xiaomi_sm6250",
-    "target_path": "kernel/xiaomi/sm6250"
-  }
-]
diff --git a/lineage_device_framework_matrix.xml b/lineage_device_framework_matrix.xml
deleted file mode 100644
index df6d755..0000000
--- a/lineage_device_framework_matrix.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<compatibility-matrix version="2.0" type="framework">
-    <hal format="hidl" optional="true">
-        <name>vendor.lineage.livedisplay</name>
-        <version>2.0</version>
-        <interface>
-            <name>IPictureAdjustment</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="true">
-        <name>vendor.lineage.trust</name>
-        <version>1.0</version>
-        <interface> 
-            <name>IUsbRestrict</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-</compatibility-matrix>
diff --git a/manifest.xml b/manifest.xml
index 920605a..4ccae76 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -130,11 +130,6 @@
         <transport>hwbinder</transport>
         <fqname>@1.0::IDisplayPostproc/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>vendor.lineage.livedisplay</name>
-        <transport>hwbinder</transport>
-        <fqname>@2.0::IPictureAdjustment/default</fqname>
-    </hal>
     <hal format="hidl">
         <name>vendor.qti.data.factory</name>
         <transport>hwbinder</transport>
diff --git a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml b/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
deleted file mode 100644
index c0f348f..0000000
--- a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015-2016 The CyanogenMod Project
-                   2017-2018 The LineageOS Project
-
-     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.
--->
-<resources>
-    <!-- Hardware keys present on the device, stored as a bit field.
-         This integer should equal the sum of the corresponding value for each
-         of the following keys present:
-             1 - Home
-             2 - Back
-             4 - Menu
-             8 - Assistant (search)
-            16 - App switch
-            32 - Camera
-            64 - Volume rocker
-         For example, a device with Home, Back and Menu keys would set this
-         config to 7. -->
-    <integer name="config_deviceHardwareKeys">64</integer>
-
-    <!-- Hardware keys present on the device with the ability to wake, stored as a bit field.
-         This integer should equal the sum of the corresponding value for each
-         of the following keys present:
-             1 - Home
-             2 - Back
-             4 - Menu
-             8 - Assistant (search)
-            16 - App switch
-            32 - Camera
-            64 - Volume rocker
-         For example, a device with Home, Back and Menu keys would set this
-         config to 7. -->
-    <integer name="config_deviceHardwareWakeKeys">64</integer>
-
-    <!-- Whether device has screen with higher aspect ratio -->
-    <bool name="config_haveHigherAspectRatioScreen">true</bool>
-
-    <!-- Whether device has a notch -->
-    <bool name="config_haveNotch">true</bool>
-
-    <!-- Defines the actions shown in advanced reboot submenu -->
-    <string-array name="config_restartActionsList">
-        <item>restart</item>
-        <item>restart_recovery</item>
-        <item>restart_bootloader</item>
-        <item>restart_fastboot</item>
-     </string-array>
-
-     <!-- All the capabilities of the LEDs on this device, stored as a bit field.
-          This integer should equal the sum of the corresponding value for each
-          of the following capabilities present:
-          // Device has a color adjustable battery light.
-          LIGHTS_RGB_NOTIFICATION_LED = 1
-          // Device has a color adjustable notification light.
-          LIGHTS_RGB_BATTERY_LED = 2
-          LIGHTS_MULTIPLE_NOTIFICATION_LED = 4 (deprecated)
-          // The notification light has adjustable pulsing capability.
-          LIGHTS_PULSATING_LED = 8
-          // Device has a multi-segment battery light that is able to
-          // use the light brightness value to determine how many
-          // segments to show (in order to represent battery level).
-          LIGHTS_SEGMENTED_BATTERY_LED = 16
-          // The notification light supports HAL adjustable brightness
-          // via the alpha channel.
-          // Note: if a device notification light supports LIGHTS_RGB_NOTIFICATION_LED
-          // then HAL support is not necessary for brightness control.  In this case,
-          // brightness support will be provided by lineage-sdk through the scaling of
-          // RGB color values.
-          LIGHTS_ADJUSTABLE_NOTIFICATION_LED_BRIGHTNESS = 32
-          // Device has a battery light.
-          LIGHTS_BATTERY_LED = 64
-          // The battery light supports HAL adjustable brightness via
-          // the alpha channel.
-          // Note: if a device battery light supports LIGHTS_RGB_BATTERY_LED then HAL
-          // support is not necessary for brightness control.  In this case,
-          // brightness support will be provided by lineage-sdk through the scaling of
-          // RGB color values.
-          LIGHTS_ADJUSTABLE_BATTERY_LED_BRIGHTNESS = 128
-          For example, a device with notification and battery lights that supports
-          pulsating and RGB control would set this config to 75. -->
-     <integer name="config_deviceLightCapabilities">232</integer>
-</resources>
diff --git a/overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml b/overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml
deleted file mode 100644
index da46c31..0000000
--- a/overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (C) 2016 The CyanogenMod Project
-
-     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.
--->
-<resources>
-    <bool name="call_recording_enabled">true</bool>
-    <integer name="call_recording_audio_source">4</integer>
-</resources>
diff --git a/overlay-lineage/packages/apps/Settings/res/values/config.xml b/overlay-lineage/packages/apps/Settings/res/values/config.xml
deleted file mode 100644
index 1515e31..0000000
--- a/overlay-lineage/packages/apps/Settings/res/values/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2021 The LineageOS Project
-
-     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.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Defines the location of the fingerprint sensor on the device
-         0 = back
-         1 = front
-         2 = left side
-         3 = right side
-    -->
-    <integer name="config_fingerprintSensorLocation">3</integer>
-</resources>
diff --git a/overlay-lineage/packages/apps/Snap/res/values/config.xml b/overlay-lineage/packages/apps/Snap/res/values/config.xml
deleted file mode 100644
index 94b9f17..0000000
--- a/overlay-lineage/packages/apps/Snap/res/values/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
-
-     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.
--->
-
-<!-- Camera app resources that may need to be customized
-     for different hardware or product builds. -->
-<resources>
-    <!-- Enable support for camera api v2 -->
-    <bool name="support_camera_api_v2">true</bool>
-
-    <!-- Opens back camera using openLegacy() and forces api v1 -->
-    <bool name="back_camera_open_legacy">false</bool>
-
-    <!-- Opens front camera using openLegacy() and forces api v1 -->
-    <bool name="front_camera_open_legacy">false</bool>
-</resources>