diff --git a/remove.xml b/remove.xml
index 508132b..ea2a3c5 100644
--- a/remove.xml
+++ b/remove.xml
@@ -8,30 +8,29 @@
   <remove-project name="platform/build" />
   <remove-project name="platform/build/soong" />
 
-  <remove-project name="platform/development" />
+  <!--<remove-project name="platform/development" />-->
 
   <remove-project name="platform/developers/build" />
   <remove-project name="platform/developers/demos" />
   <remove-project name="platform/developers/samples/android" />
 
   <remove-project name="device/common" />
+  <remove-project name="device/amlogic/yukawa" />
+  <remove-project name="device/amlogic/yukawa-kernel" />
   <remove-project name="device/generic/arm64" />
   <remove-project name="device/generic/armv7-a-neon" />
   <remove-project name="device/generic/car" />
-  <remove-project name="device/generic/mips" />
-  <remove-project name="device/generic/mips64" />
   <remove-project name="device/generic/mini-emulator-arm64" />
   <remove-project name="device/generic/mini-emulator-armv7-a-neon" />
-  <remove-project name="device/generic/mini-emulator-mips" />
-  <remove-project name="device/generic/mini-emulator-mips64" />
   <remove-project name="device/generic/mini-emulator-x86" />
   <remove-project name="device/generic/mini-emulator-x86_64" />
   <remove-project name="device/generic/qemu" />
   <remove-project name="device/generic/x86" />
   <remove-project name="device/generic/x86_64" />
-  <remove-project name="device/google/accessory/arduino" />
-  <remove-project name="device/google/accessory/demokit" />
   <remove-project name="device/google/atv" />
+  <remove-project name="device/google/bonito" />
+  <remove-project name="device/google/bonito-kernel" />
+  <remove-project name="device/google/bonito-sepolicy" />
   <remove-project name="device/google/contexthub" />
   <remove-project name="device/google/crosshatch" />
   <remove-project name="device/google/crosshatch-kernel" />
@@ -39,6 +38,8 @@
   <remove-project name="device/google/cuttlefish" />
   <remove-project name="device/google/cuttlefish_kernel" />
   <remove-project name="device/google/cuttlefish_common" />
+  <remove-project name="device/google/cuttlefish_vmm" />
+  <remove-project name="device/google/fuchsia" />
   <remove-project name="device/google/marlin" />
   <remove-project name="device/google/marlin-kernel" />
   <remove-project name="device/google/muskie" />
@@ -51,21 +52,26 @@
   <remove-project name="device/linaro/bootloader/OpenPlatformPkg" />
   <remove-project name="device/linaro/hikey" />
   <remove-project name="device/linaro/hikey-kernel" />
+  <remove-project name="device/linaro/poplar" />
+  <remove-project name="device/linaro/poplar-kernel" />
+  <remove-project name="device/ti/beagle-x15" />
+  <remove-project name="device/ti/beagle-x15-kernel" />
   <remove-project name="device/sample" />
 
+  <remove-project name="platform/external/nos/host/android" />
+  <remove-project name="platform/external/nos/host/generic" />
+  <remove-project name="platform/external/nos/test/system-test-harness" />
+
   <remove-project name="platform/external/aac" />
   <remove-project name="platform/external/e2fsprogs" />
   <remove-project name="platform/external/chromium-webview" />
   <remove-project name="platform/external/f2fs-tools" />
   <remove-project name="platform/external/libnfnetlink" />
   <remove-project name="platform/external/libnetfilter_conntrack" />
-  <remove-project name="platform/external/nos/host/android" />
-  <remove-project name="platform/external/nos/host/generic" />
-  <remove-project name="platform/external/nos/test/system-test-harness" />
-  <remove-project name="platform/external/mksh" />
-  <remove-project name="platform/external/tinycompress" />
+  <!--<remove-project name="platform/external/mksh" /> -->
+  <!--<remove-project name="platform/external/tinycompress" /> -->
   <remove-project name="platform/external/selinux" />
-  <remove-project name="platform/external/skia" />
+  <!--<remove-project name="platform/external/skia" />-->
   <remove-project name="platform/external/toybox" />
 
   <remove-project name="platform/frameworks/av" />
@@ -75,27 +81,11 @@
   <remove-project name="platform/frameworks/opt/net/ims" />
   <remove-project name="platform/frameworks/opt/net/wifi" />
 
-  <remove-project name="platform/hardware/intel/audio_media" />
-  <remove-project name="platform/hardware/intel/bootstub" />
-  <remove-project name="platform/hardware/intel/common/bd_prov" />
-  <remove-project name="platform/hardware/intel/common/libmix" />
-  <remove-project name="platform/hardware/intel/common/libstagefrighthw" />
-  <remove-project name="platform/hardware/intel/common/libva" />
-  <remove-project name="platform/hardware/intel/common/libwsbm" />
-  <remove-project name="platform/hardware/intel/common/omx-components" />
-  <remove-project name="platform/hardware/intel/common/utils" />
-  <remove-project name="platform/hardware/intel/common/wrs_omxil_core" />
-  <remove-project name="platform/hardware/intel/img/hwcomposer" />
-  <remove-project name="platform/hardware/intel/img/psb_headers" />
-  <remove-project name="platform/hardware/intel/img/psb_video" />
-  <remove-project name="platform/hardware/intel/sensors" />
-
-  <remove-project name="platform/hardware/invensense" />
+  <!--<remove-project name="platform/hardware/invensense" /> -->
   <remove-project name="platform/hardware/interfaces" />
   <remove-project name="platform/hardware/libhardware" />
   <remove-project name="platform/hardware/libhardware_legacy" />
 
-  <remove-project name="platform/hardware/marvell/bt" />
   <remove-project name="platform/hardware/nxp/nfc" />
 
   <remove-project name="platform/hardware/qcom/audio" />
@@ -120,6 +110,7 @@
   <remove-project name="platform/hardware/qcom/sdm845/media" />
   <remove-project name="platform/hardware/qcom/power" />
   <remove-project name="platform/hardware/qcom/wlan" />
+
   <remove-project name="platform/hardware/ril" />
 
   <remove-project name="kernel/tests" />
@@ -129,11 +120,11 @@
   <remove-project name="platform/packages/apps/CellBroadcastReceiver" />
   <remove-project name="platform/packages/apps/Contacts" />
   <remove-project name="platform/packages/apps/DeskClock" />
+  <remove-project name="platform/packages/apps/DocumentsUI" />
   <remove-project name="platform/packages/apps/Dialer" />
-  <remove-project name="platform/packages/apps/EmergencyInfo" />
+  <!--<remove-project name="platform/packages/apps/EmergencyInfo" />-->
   <remove-project name="platform/packages/apps/Gallery" />
   <remove-project name="platform/packages/apps/Gallery2" />
-  <remove-project name="platform/packages/apps/Launcher2" />
   <remove-project name="platform/packages/apps/Launcher3" />
   <remove-project name="platform/packages/apps/Messaging" />
   <remove-project name="platform/packages/apps/Music" />
@@ -142,8 +133,8 @@
   <remove-project name="platform/packages/apps/PhoneCommon" />
   <remove-project name="platform/packages/apps/Settings" />
   <remove-project name="platform/packages/apps/SettingsIntelligence" />
-  <remove-project name="platform/packages/apps/Stk" />
-  <remove-project name="platform/packages/apps/Tag" />
+  <!--<remove-project name="platform/packages/apps/Stk" /> -->
+  <!--<remove-project name="platform/packages/apps/Tag" /> -->
 
   <remove-project name="platform/packages/inputmethods/LatinIME" />
 
@@ -152,7 +143,7 @@
   <remove-project name="platform/packages/services/Telephony" />
   <remove-project name="platform/packages/services/Telecomm" />
 
-  <remove-project name="platform/prebuilts/build-tools" />
+  <!--<remove-project name="platform/prebuilts/build-tools" /> -->
 
   <remove-project name="platform/system/bt" />
   <remove-project name="platform/system/core" />
@@ -160,10 +151,9 @@
   <remove-project name="platform/system/libhidl" />
   <remove-project name="platform/system/media" />
   <remove-project name="platform/system/nfc" />
-  <remove-project name="platform/system/netd" />
+  <!-- <remove-project name="platform/system/netd" /> -->
   <remove-project name="platform/system/sepolicy" />
   <remove-project name="platform/system/vold" />
   <remove-project name="platform/system/hardware/interfaces" />
   <remove-project name="platform/system/update_engine" />
-  <remove-project name="platform/packages/apps/DocumentsUI" />
 </manifest>