diff --git a/config/common.mk b/config/common.mk
index d5044f1c1b56a35792eec6094b105d7f648336e8..1dd08ec640cc9695421f90e362a4bb6562e83f85 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -14,59 +14,13 @@
 
 VENDOR_PATH := vendor/eos
 
-PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
-    system/%
-
-# /e/ OS packages
-PRODUCT_PACKAGES += \
-    GmsCore \
-    GsfProxy \
-    FakeStore \
-    Mail \
-    BlissLauncher3 \
-    BlissWeather \
-    AccountManager \
-    Camera \
-    eDrive \
-    Notes \
-    Tasks \
-    DroidGuard \
-    OpenKeychain \
-    Browser \
-    BrowserWebView \
-    Apps \
-    PwaPlayer \
-    AdvancedPrivacy \
-    SplitInstallService \
-    WebCalendarManager \
-    Talkback \
-    mapsOverlay \
-    eCalendar \
-    Ntfy \
-    MurenaMDM
-
 # Removes proprietary apps
 PRODUCT_PACKAGES += \
     RemoveProprietaryApps
 
-# Parental
-PRODUCT_PACKAGES += ParentalControl
-
-SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += vendor/eos/sepolicy
-
 # PicoTTS
 $(call inherit-product, external/svox/svox_tts.mk)
 
-# Optional applications
-MINIMAL_APPS ?= false
-
-ifeq ($(MINIMAL_APPS),false)
-PRODUCT_PACKAGES += \
-    MagicEarth \
-    PdfViewer
-
-endif
-
 # CustomLocale
 ifeq (test,$(RELEASE_TYPE))
 PRODUCT_PACKAGES += \
@@ -102,3 +56,5 @@ ifeq (true,$(INCLUDE_IH8SN))
   PRODUCT_PACKAGES += ih8sn
   PRODUCT_COPY_FILES += $(DEFAULT_CONFIGURATION_FILE):$(TARGET_COPY_OUT_SYSTEM)/etc/ih8sn.conf
 endif
+
+include $(call inherit-product, prebuilts/prebuiltapks/config/common.mk)
diff --git a/config/telephony.mk b/config/telephony.mk
index 6754e59d23691af953e5f7c8b71ee46cf5e1e0f4..2dc3f08c5a5bc66ef8a42154271dd81d6563f99d 100644
--- a/config/telephony.mk
+++ b/config/telephony.mk
@@ -2,5 +2,4 @@
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.config.ringtone=Dione.ogg
 
-PRODUCT_PACKAGES += \
-    Message
+include $(call inherit-product, prebuilts/prebuiltapks/config/telephony.mk)
diff --git a/overlay/rro_overlays/mapsOverlay/Android.bp b/overlay/rro_overlays/mapsOverlay/Android.bp
deleted file mode 100644
index fc40ba6d33edc6c5f3e4e20863aedf584df4ef56..0000000000000000000000000000000000000000
--- a/overlay/rro_overlays/mapsOverlay/Android.bp
+++ /dev/null
@@ -1,4 +0,0 @@
-runtime_resource_overlay {
-    name: "mapsOverlay",
-    product_specific: true,
-}
diff --git a/overlay/rro_overlays/mapsOverlay/AndroidManifest.xml b/overlay/rro_overlays/mapsOverlay/AndroidManifest.xml
deleted file mode 100644
index 90929a4a10995484a2925677b495134c95821de4..0000000000000000000000000000000000000000
--- a/overlay/rro_overlays/mapsOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="foundation.e.mapsoverlay"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="com.generalmagic.magicearth"
-      android:isStatic="true"
-      android:priority="0"/>
-</manifest>
diff --git a/overlay/rro_overlays/mapsOverlay/res/drawable/icon_magicearth_notification.png b/overlay/rro_overlays/mapsOverlay/res/drawable/icon_magicearth_notification.png
deleted file mode 100644
index e5152352037dd593d189c6bc06ae25f6c13c3278..0000000000000000000000000000000000000000
Binary files a/overlay/rro_overlays/mapsOverlay/res/drawable/icon_magicearth_notification.png and /dev/null differ
diff --git a/overlay/rro_overlays/mapsOverlay/res/mipmap-hdpi/app_icon_foreground.png b/overlay/rro_overlays/mapsOverlay/res/mipmap-hdpi/app_icon_foreground.png
deleted file mode 100644
index f51aff95f8194c953053ec43ba4f8ef6b417ea32..0000000000000000000000000000000000000000
Binary files a/overlay/rro_overlays/mapsOverlay/res/mipmap-hdpi/app_icon_foreground.png and /dev/null differ
diff --git a/overlay/rro_overlays/mapsOverlay/res/mipmap-hdpi/ic_launcher_foreground.png b/overlay/rro_overlays/mapsOverlay/res/mipmap-hdpi/ic_launcher_foreground.png
deleted file mode 100644
index f51aff95f8194c953053ec43ba4f8ef6b417ea32..0000000000000000000000000000000000000000
Binary files a/overlay/rro_overlays/mapsOverlay/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/overlay/rro_overlays/mapsOverlay/res/mipmap-mdpi/app_icon_foreground.png b/overlay/rro_overlays/mapsOverlay/res/mipmap-mdpi/app_icon_foreground.png
deleted file mode 100644
index 1f8ced469f472f66652eac03cbdff4c0c150f6cc..0000000000000000000000000000000000000000
Binary files a/overlay/rro_overlays/mapsOverlay/res/mipmap-mdpi/app_icon_foreground.png and /dev/null differ
diff --git a/overlay/rro_overlays/mapsOverlay/res/mipmap-mdpi/ic_launcher_foreground.png b/overlay/rro_overlays/mapsOverlay/res/mipmap-mdpi/ic_launcher_foreground.png
deleted file mode 100644
index 1f8ced469f472f66652eac03cbdff4c0c150f6cc..0000000000000000000000000000000000000000
Binary files a/overlay/rro_overlays/mapsOverlay/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/overlay/rro_overlays/mapsOverlay/res/mipmap-xhdpi/app_icon_foreground.png b/overlay/rro_overlays/mapsOverlay/res/mipmap-xhdpi/app_icon_foreground.png
deleted file mode 100644
index 5aa9f3cf8f0c2ca43ab9eeb13f0ff38750b7d31f..0000000000000000000000000000000000000000
Binary files a/overlay/rro_overlays/mapsOverlay/res/mipmap-xhdpi/app_icon_foreground.png and /dev/null differ
diff --git a/overlay/rro_overlays/mapsOverlay/res/mipmap-xhdpi/ic_launcher_foreground.png b/overlay/rro_overlays/mapsOverlay/res/mipmap-xhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 5aa9f3cf8f0c2ca43ab9eeb13f0ff38750b7d31f..0000000000000000000000000000000000000000
Binary files a/overlay/rro_overlays/mapsOverlay/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/overlay/rro_overlays/mapsOverlay/res/mipmap-xxhdpi/app_icon_foreground.png b/overlay/rro_overlays/mapsOverlay/res/mipmap-xxhdpi/app_icon_foreground.png
deleted file mode 100644
index c759e3abb14bf5690c9ec2431f3f0a4881649f44..0000000000000000000000000000000000000000
Binary files a/overlay/rro_overlays/mapsOverlay/res/mipmap-xxhdpi/app_icon_foreground.png and /dev/null differ
diff --git a/overlay/rro_overlays/mapsOverlay/res/mipmap-xxhdpi/ic_launcher_foreground.png b/overlay/rro_overlays/mapsOverlay/res/mipmap-xxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index c759e3abb14bf5690c9ec2431f3f0a4881649f44..0000000000000000000000000000000000000000
Binary files a/overlay/rro_overlays/mapsOverlay/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/overlay/rro_overlays/mapsOverlay/res/mipmap-xxxhdpi/app_icon_foreground.png b/overlay/rro_overlays/mapsOverlay/res/mipmap-xxxhdpi/app_icon_foreground.png
deleted file mode 100644
index cd14b02581814da33df466ad7c50b336660722f2..0000000000000000000000000000000000000000
Binary files a/overlay/rro_overlays/mapsOverlay/res/mipmap-xxxhdpi/app_icon_foreground.png and /dev/null differ
diff --git a/overlay/rro_overlays/mapsOverlay/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/overlay/rro_overlays/mapsOverlay/res/mipmap-xxxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index cd14b02581814da33df466ad7c50b336660722f2..0000000000000000000000000000000000000000
Binary files a/overlay/rro_overlays/mapsOverlay/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/overlay/rro_overlays/mapsOverlay/res/values/strings.xml b/overlay/rro_overlays/mapsOverlay/res/values/strings.xml
deleted file mode 100644
index fe894cfb7f9b36fdf6d9ca176da01c8ff437550a..0000000000000000000000000000000000000000
--- a/overlay/rro_overlays/mapsOverlay/res/values/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright Murena SAS 2024
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="app_name">Maps</string>
-    <string name="nav_header_title">Maps</string>
-</resources>
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
deleted file mode 100644
index ef2691409831d1eb60621179769488dc5d838d5a..0000000000000000000000000000000000000000
--- a/sepolicy/file_contexts
+++ /dev/null
@@ -1 +0,0 @@
-/system/bin/set-device-owner\.sh u:object_r:shell_exec:s0