diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 8ccced7..b878b3e 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -57,8 +57,6 @@
         "logd",
         "run-as",
         "secilc",
-        "mke2fs",
-        "e2fsdroid",
 
         // "com.android.adbd" requires these,
         "libadbd_auth",
@@ -69,15 +67,11 @@
 
         "apexd",
         "debuggerd",
-        "e2fsck",
         "keystore2",
         "linker",
         "linkerconfig",
         "servicemanager",
         "tombstoned",
-        "tune2fs",
-        "vdc",
-        "vold",
         "wait_for_keymaster",
         "cgroups.json",
         "public.libraries.android.txt",
@@ -218,8 +212,7 @@
             cmdline: microdroid_boot_cmdline +
                 "pci=noacpi " +
                 "androidboot.boot_devices=pci0000:00/0000:00:01.0," + // os
-                "pci0000:00/0000:00:03.0," + // payload
-                "pci0000:00/0000:00:04.0", // userdata
+                "pci0000:00/0000:00:03.0", // payload
         },
     },
     dtb_prebuilt: "dummy_dtb.img",
@@ -404,11 +397,6 @@
 }
 
 prebuilt_etc {
-    name: "microdroid_cdisk_userdata.json",
-    src: "microdroid_cdisk_userdata.json",
-}
-
-prebuilt_etc {
     name: "microdroid_payload.json",
     src: "microdroid_payload.json",
 }