diff --git a/remove.xml b/remove.xml
index 22c46f3..8f9a578 100644
--- a/remove.xml
+++ b/remove.xml
@@ -41,13 +41,7 @@
   <remove-project name="device/google/crosshatch" />
   <remove-project name="device/google/crosshatch-kernel" />
   <remove-project name="device/google/crosshatch-sepolicy" />
-  <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" />
   <remove-project name="device/google/taimen" />
   <remove-project name="device/google/wahoo" />
@@ -64,8 +58,8 @@
   <remove-project name="device/ti/beagle-x15-kernel" />
   <remove-project name="device/sample" />
 
-  <remove-project name="platform/external/aac" />
-  <remove-project name="platform/external/e2fsprogs" />
+  <!--<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" />
@@ -76,20 +70,20 @@
   <!--<remove-project name="platform/external/skia" />-->
   <remove-project name="platform/external/toybox" />
 
-  <remove-project name="platform/frameworks/av" />
+  <!-- <remove-project name="platform/frameworks/av" /> -->
   <remove-project name="platform/frameworks/base" />
-  <remove-project name="platform/frameworks/native" />
+  <!-- <remove-project name="platform/frameworks/native" /> -->
   <remove-project name="platform/frameworks/opt/chips" />
-  <remove-project name="platform/frameworks/opt/telephony" />
-  <remove-project name="platform/frameworks/opt/net/ims" />
-  <remove-project name="platform/frameworks/opt/net/wifi" />
+  <!--<remove-project name="platform/frameworks/opt/telephony" />-->
+  <!--<remove-project name="platform/frameworks/opt/net/ims" />-->
+  <!--<remove-project name="platform/frameworks/opt/net/wifi" />-->
 
   <!--<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/nxp/nfc" />
+  <!--<remove-project name="platform/hardware/nxp/nfc" />-->
 
   <remove-project name="platform/hardware/google/pixel-sepolicy" />
   <remove-project name="platform/hardware/qcom/audio" />
@@ -114,7 +108,7 @@
   <remove-project name="platform/hardware/qcom/power" />
   <remove-project name="platform/hardware/qcom/wlan" />
 
-  <remove-project name="platform/hardware/ril" />
+  <!--<remove-project name="platform/hardware/ril" />-->
 
   <remove-project name="kernel/tests" />
 
@@ -136,7 +130,7 @@
   <remove-project name="platform/packages/apps/Nfc" />
   <remove-project name="platform/packages/apps/PackageInstaller" />
   <remove-project name="platform/packages/apps/PhoneCommon" />
-  <remove-project name="platform/packages/apps/Provision" />
+  <!--<remove-project name="platform/packages/apps/Provision" />-->
   <remove-project name="platform/packages/apps/Settings" />
   <remove-project name="platform/packages/apps/SettingsIntelligence" />
   <!--<remove-project name="platform/packages/apps/Stk" /> -->
@@ -147,23 +141,27 @@
 
   <remove-project name="platform/packages/inputmethods/LatinIME" />
 
-  <remove-project name="platform/packages/providers/DownloadProvider" />
-  <remove-project name="platform/packages/providers/MediaProvider" />
+  <!--<remove-project name="platform/packages/providers/DownloadProvider" />-->
+  <!--<remove-project name="platform/packages/providers/MediaProvider" /> -->
 
-  <remove-project name="platform/packages/services/Telephony" />
-  <remove-project name="platform/packages/services/Telecomm" />
+  <!--<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/system/bpf" />
-  <remove-project name="platform/system/bt" />
+  <!--<remove-project name="platform/system/bpf" />-->
+  <!--<remove-project name="platform/system/bt" />-->
   <remove-project name="platform/system/core" />
   <remove-project name="platform/system/extras" />
   <remove-project name="platform/system/libhidl" />
   <remove-project name="platform/system/media" />
   <remove-project name="platform/system/nfc" />
-  <remove-project name="platform/system/sepolicy" />
+  <!--<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/system/hardware/interfaces" />-->
+  <!--<remove-project name="platform/system/update_engine" />-->
+  
+  <remove-project name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" />
+  <remove-project name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" />
+
 </manifest>