diff --git a/default.xml b/default.xml
index 0c5ea14..84b0c50 100644
--- a/default.xml
+++ b/default.xml
@@ -204,7 +204,6 @@
   <project path="packages/apps/BasicSmsReceiver" name="LineageOS-mirror/android_packages_apps_BasicSmsReceiver.git" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/apps/Bluetooth" name="LineageOS-mirror/android_packages_apps_Bluetooth.git" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/apps/BluetoothExt" name="LineageOS-mirror/android_packages_apps_BluetoothExt.git" />
-  <project path="packages/apps/Browser" name="replicant/packages_apps_Browser.git" remote="replicant" groups="pdk-fs" />
   <project path="packages/apps/Calendar" name="LineageOS-mirror/android_packages_apps_Calendar.git" groups="pdk-fs" />
   <project path="packages/apps/Camera2" name="LineageOS-mirror/android_packages_apps_Camera2.git" groups="pdk-fs" />
   <project path="packages/apps/LegacyCamera" name="replicant/packages_apps_LegacyCamera.git" remote="replicant" groups="pdk-fs" />
@@ -219,20 +218,16 @@
   <project path="packages/apps/DeskClock" name="LineageOS-mirror/android_packages_apps_DeskClock.git" groups="pdk-fs" />
   <project path="packages/apps/Dialer" name="LineageOS-mirror/android_packages_apps_Dialer.git" groups="pdk-fs" />
   <project path="packages/apps/Eleven" name="LineageOS-mirror/android_packages_apps_Eleven.git" />
-  <project path="packages/apps/Email" name="LineageOS-mirror/android_packages_apps_Email.git" groups="pdk-fs" />
+  <project path="packages/apps/Email" name="replicant-packages_apps_Email.git" remote="adhoc" groups="pdk-fs" />
   <project path="packages/apps/ExactCalculator" name="LineageOS-mirror/android_packages_apps_ExactCalculator.git" groups="pdk-fs" />
-  <project path="packages/apps/Exchange" name="LineageOS-mirror/android_packages_apps_Exchange.git" groups="pdk-fs" />
   <project path="packages/apps/FDroidPrivilegedExtension" name="privileged-extension.git" remote="fdroid" />
   <project path="packages/apps/FMRadio" name="LineageOS-mirror/android_packages_apps_FMRadio.git" groups="pdk-fs" />
-  <project path="packages/apps/Gallery" name="platform/packages/apps/Gallery.git" groups="pdk-fs" remote="aosp" />
-  <project path="packages/apps/Gallery2" name="LineageOS-mirror/android_packages_apps_Gallery2.git" groups="pdk-fs" />
   <project path="packages/apps/Gello" name="LineageOS-mirror/android_packages_apps_Gello.git" />
   <project path="packages/apps/HTMLViewer" name="LineageOS-mirror/android_packages_apps_HTMLViewer.git" groups="pdk-fs" />
   <project path="packages/apps/InCallUI" name="LineageOS-mirror/android_packages_apps_InCallUI.git" groups="pdk-fs" />
   <project path="packages/apps/KeyChain" name="LineageOS-mirror/android_packages_apps_KeyChain.git" groups="pdk-fs" />
   <project path="packages/apps/LockClock" name="LineageOS-mirror/android_packages_apps_LockClock.git" />
   <project path="packages/apps/ManagedProvisioning" name="LineageOS-mirror/android_packages_apps_ManagedProvisioning.git" groups="pdk-fs" />
-  <project path="packages/apps/Messaging" name="LineageOS-mirror/android_packages_apps_Messaging.git" groups="pdk-fs" />
   <project path="packages/apps/Nfc" name="LineageOS-mirror/android_packages_apps_Nfc.git" groups="apps_nfc,pdk-fs" />
   <project path="packages/apps/PackageInstaller" name="LineageOS-mirror/android_packages_apps_PackageInstaller.git" groups="pdk-fs" />
   <project path="packages/apps/PhoneCommon" name="LineageOS-mirror/android_packages_apps_PhoneCommon.git" groups="pdk-cw-fs,pdk-fs" />