diff --git a/dist-google/cm-data/99-perso-google-clean.sh.addon b/dist-google/cm-data/99-perso-google-clean.sh.addon
index 35ffa95..9523c60 100755
--- a/dist-google/cm-data/99-perso-google-clean.sh.addon
+++ b/dist-google/cm-data/99-perso-google-clean.sh.addon
@@ -34,12 +34,8 @@ case "$1" in
     rm -rf $(get_output_path $PRODUCT/app/PrebuiltExchange3Google)
     rm -rf $(get_output_path $PRODUCT/app/MarkupGoogle)
     rm -rf $(get_output_path $PRODUCT/app/talkback)
-    rm -rf $(get_output_path $PRODUCT/app/Tycho)
     rm -rf $(get_output_path $PRODUCT/priv-app/AndroidMigratePrebuilt)
     rm -rf $(get_output_path $PRODUCT/priv-app/SetupWizardPrebuilt)
-    rm -rf $(get_output_path $PRODUCT/priv-app/CarrierServices)
-    rm -rf $(get_output_path $PRODUCT/priv-app/DevicePersonalizationPrebuiltPixel4)
-    rm -rf $(get_output_path $PRODUCT/priv-app/SCONE)
     rm -rf $(get_output_path $PRODUCT/priv-app/Velvet)
     rm -rf $(get_output_path $SYSTEM_EXT/priv-app/GoogleFeedback)
   ;;
diff --git a/dist-std/cm-data/99-perso.sh.addon b/dist-std/cm-data/99-perso.sh.addon
index 950efca..993d011 100755
--- a/dist-std/cm-data/99-perso.sh.addon
+++ b/dist-std/cm-data/99-perso.sh.addon
@@ -76,6 +76,14 @@ case "$1" in
     rm -rf $(get_output_path $PRODUCT/app/Recorder)
     # lineageos 18
     rm -rf $(get_output_path $SYSTEM_EXT/priv-app/Gallery2)
+    # lineageos 18, pixel specific stuff
+    rm -rf $(get_output_path $PRODUCT/app/Tycho)
+    rm -rf $(get_output_path $PRODUCT/priv-app/CarrierServices)
+    rm -rf $(get_output_path $PRODUCT/priv-app/DevicePersonalizationPrebuiltPixel4)
+    rm -rf $(get_output_path $PRODUCT/priv-app/SCONE)
+    # eSim stuff, crashing a lot
+    rm -rf $(get_output_path $PRODUCT/priv-app/EuiccGoogle)
+    rm -rf $(get_output_path $PRODUCT/priv-app/EuiccSupportPixel)
     # omnirom
     rm -rf $(get_output_path $SYS/priv-app/Launcher3)
     rm -rf $(get_output_path $SYS/priv-app/OmniBrain)