diff --git a/init.mini-emulator.rc b/init.mini-emulator.rc
index 56f7d60..628015e 100644
--- a/init.mini-emulator.rc
+++ b/init.mini-emulator.rc
@@ -1,22 +1,11 @@
 on init
-    # See storage config details at http://source.android.com/tech/storage/
-    mkdir /mnt/shell/emulated 0700 shell shell
-    mkdir /storage/emulated 0555 root root
-
-    export EXTERNAL_STORAGE /storage/emulated/legacy
-    export EMULATED_STORAGE_SOURCE /mnt/shell/emulated
-    export EMULATED_STORAGE_TARGET /storage/emulated
-
     # Support legacy paths
-    symlink /storage/emulated/legacy /sdcard
-    symlink /storage/emulated/legacy /mnt/sdcard
-    symlink /storage/emulated/legacy /storage/sdcard0
-    symlink /mnt/shell/emulated/0 /storage/emulated/legacy
+    symlink /sdcard /mnt/sdcard
+    symlink /sdcard /storage/sdcard0
 
     mount debugfs debugfs /sys/kernel/debug
 
 on post-fs-data
-    mkdir /data/media 0770 media_rw media_rw
     # Set indication (checked by vold) that we have finished this action
     setprop vold.post_fs_data_done 1
     # to force to start sdcard
@@ -98,7 +87,3 @@
 
 service goldfish-logcat /system/bin/logcat -Q
     oneshot
-
-# virtual sdcard daemon running as media_rw (1023)
-service sdcard /system/bin/sdcard -u 1023 -g 1023 -l /data/media /mnt/shell/emulated
-    class late_start