diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index 546f802..3b7e6e1 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -697,12 +697,6 @@
         vol->destroy();
     }
     mInternalEmulatedVolumes.clear();
-    // Add user 0 cos it's always running and started
-    auto vol = std::shared_ptr<android::vold::VolumeBase>(
-            new android::vold::EmulatedVolume("/data/media", 0));
-    vol->setMountUserId(0);
-    vol->create();
-    mInternalEmulatedVolumes.push_back(vol);
 
     for (const auto& disk : mDisks) {
         disk->destroy();
@@ -711,8 +705,6 @@
     updateVirtualDisk();
     mAddedUsers.clear();
     mStartedUsers.clear();
-
-    mStartedUsers.insert(0);
     return 0;
 }