Index: HelenOS.config
===================================================================
--- HelenOS.config	(revision 2e231aba2f8ff8ab107145e459a104ee6792090f)
+++ HelenOS.config	(revision a63d216495adb3387eab99c836001a569678383b)
@@ -609,10 +609,4 @@
 ! [CONFIG_DEBUG=y] CONFIG_TEST_DRIVERS (n/y)
 
-% Load disk drivers on startup
-! CONFIG_START_BD (n/y)
-
-% Mount /data on startup
-! [CONFIG_START_BD=y] CONFIG_MOUNT_DATA (n/y)
-
 % Write core files
 ! CONFIG_WRITE_CORE_FILES (n/y)
Index: defaults/amd64/Makefile.config
===================================================================
--- defaults/amd64/Makefile.config	(revision 2e231aba2f8ff8ab107145e459a104ee6792090f)
+++ defaults/amd64/Makefile.config	(revision a63d216495adb3387eab99c836001a569678383b)
@@ -59,10 +59,4 @@
 CONFIG_BFB_BPP = 16
 
-# Load disk drivers on startup
-CONFIG_START_BD = n
-
-# Mount /data on startup
-CONFIG_MOUNT_DATA = n
-
 # OHCI root hub power switch, ganged is enough
 OHCI_POWER_SWITCH = ganged
Index: defaults/arm32/Makefile.config
===================================================================
--- defaults/arm32/Makefile.config	(revision 2e231aba2f8ff8ab107145e459a104ee6792090f)
+++ defaults/arm32/Makefile.config	(revision a63d216495adb3387eab99c836001a569678383b)
@@ -34,9 +34,2 @@
 # What is your output device?
 CONFIG_HID_OUT = generic
-
-# Load disk drivers on startup
-CONFIG_START_BD = n
-
-# Mount /data on startup
-CONFIG_MOUNT_DATA = n
-
Index: defaults/ia32/Makefile.config
===================================================================
--- defaults/ia32/Makefile.config	(revision 2e231aba2f8ff8ab107145e459a104ee6792090f)
+++ defaults/ia32/Makefile.config	(revision a63d216495adb3387eab99c836001a569678383b)
@@ -65,10 +65,4 @@
 CONFIG_BFB_BPP = 16
 
-# Load disk drivers on startup
-CONFIG_START_BD = n
-
-# Mount /data on startup
-CONFIG_MOUNT_DATA = n
-
 # OHCI root hub power switch, ganged is enough
 OHCI_POWER_SWITCH = ganged
Index: defaults/ia64/Makefile.config
===================================================================
--- defaults/ia64/Makefile.config	(revision 2e231aba2f8ff8ab107145e459a104ee6792090f)
+++ defaults/ia64/Makefile.config	(revision a63d216495adb3387eab99c836001a569678383b)
@@ -46,9 +46,2 @@
 # Output device class
 CONFIG_HID_OUT = generic
-
-# Load disk drivers on startup
-CONFIG_START_BD = n
-
-# Mount /data on startup
-CONFIG_MOUNT_DATA = n
-
Index: defaults/mips32/Makefile.config
===================================================================
--- defaults/mips32/Makefile.config	(revision 2e231aba2f8ff8ab107145e459a104ee6792090f)
+++ defaults/mips32/Makefile.config	(revision a63d216495adb3387eab99c836001a569678383b)
@@ -41,10 +41,4 @@
 CONFIG_HID_OUT = generic
 
-# Load disk drivers on startup
-CONFIG_START_BD = n
-
-# Mount /data on startup
-CONFIG_MOUNT_DATA = n
-
 # Barebone build with essential binaries only 
 CONFIG_BAREBONE = y
Index: defaults/mips64/Makefile.config
===================================================================
--- defaults/mips64/Makefile.config	(revision 2e231aba2f8ff8ab107145e459a104ee6792090f)
+++ defaults/mips64/Makefile.config	(revision a63d216495adb3387eab99c836001a569678383b)
@@ -40,9 +40,2 @@
 # Output device class
 CONFIG_HID_OUT = generic
-
-# Load disk drivers on startup
-CONFIG_START_BD = n
-
-# Mount /data on startup
-CONFIG_MOUNT_DATA = n
-
Index: defaults/ppc32/Makefile.config
===================================================================
--- defaults/ppc32/Makefile.config	(revision 2e231aba2f8ff8ab107145e459a104ee6792090f)
+++ defaults/ppc32/Makefile.config	(revision a63d216495adb3387eab99c836001a569678383b)
@@ -38,10 +38,4 @@
 CONFIG_FB = y
 
-# Load disk drivers on startup
-CONFIG_START_BD = n
-
-# Mount /data on startup
-CONFIG_MOUNT_DATA = n
-
 # OHCI root hub power switch, ganged is enough
 OHCI_POWER_SWITCH = ganged
Index: defaults/sparc32/Makefile.config
===================================================================
--- defaults/sparc32/Makefile.config	(revision 2e231aba2f8ff8ab107145e459a104ee6792090f)
+++ defaults/sparc32/Makefile.config	(revision a63d216495adb3387eab99c836001a569678383b)
@@ -52,9 +52,2 @@
 # Start AP processors by the loader
 CONFIG_AP = y
-
-# Load disk drivers on startup
-CONFIG_START_BD = n
-
-# Mount /data on startup
-CONFIG_MOUNT_DATA = n
-
Index: defaults/sparc64/Makefile.config
===================================================================
--- defaults/sparc64/Makefile.config	(revision 2e231aba2f8ff8ab107145e459a104ee6792090f)
+++ defaults/sparc64/Makefile.config	(revision a63d216495adb3387eab99c836001a569678383b)
@@ -52,9 +52,2 @@
 # Start AP processors by the loader
 CONFIG_AP = y
-
-# Load disk drivers on startup
-CONFIG_START_BD = n
-
-# Mount /data on startup
-CONFIG_MOUNT_DATA = n
-
Index: defaults/special/Makefile.config
===================================================================
--- defaults/special/Makefile.config	(revision 2e231aba2f8ff8ab107145e459a104ee6792090f)
+++ defaults/special/Makefile.config	(revision a63d216495adb3387eab99c836001a569678383b)
@@ -28,6 +28,2 @@
 # Compile kernel tests
 CONFIG_TEST = y
-
-# Load disk drivers on startup
-CONFIG_START_BD = n
-
Index: uspace/app/init/init.c
===================================================================
--- uspace/app/init/init.c	(revision 2e231aba2f8ff8ab107145e459a104ee6792090f)
+++ uspace/app/init/init.c	(revision a63d216495adb3387eab99c836001a569678383b)
@@ -59,8 +59,4 @@
 #define TMPFS_FS_TYPE      "tmpfs"
 #define TMPFS_MOUNT_POINT  "/tmp"
-
-#define DATA_FS_TYPE      "fat"
-#define DATA_DEVICE       "bd/ata1disk0"
-#define DATA_MOUNT_POINT  "/data"
 
 #define SRV_CONSOLE  "/srv/console"
@@ -316,11 +312,4 @@
 }
 
-static bool mount_data(void)
-{
-	int rc = mount(DATA_FS_TYPE, DATA_MOUNT_POINT, DATA_DEVICE, "wtcache", 0, 0);
-	return mount_report("Data filesystem", DATA_MOUNT_POINT, DATA_FS_TYPE,
-	    DATA_DEVICE, rc);
-}
-
 int main(int argc, char *argv[])
 {
@@ -366,22 +355,4 @@
 	srv_start("/srv/clipboard");
 	srv_start("/srv/remcons");
-	
-	/*
-	 * Start these synchronously so that mount_data() can be
-	 * non-blocking.
-	 */
-#ifdef CONFIG_START_BD
-	srv_start("/srv/ata_bd");
-#endif
-	
-#ifdef CONFIG_MOUNT_DATA
-	/* Make sure fat is running. */
-	if (str_cmp(STRING(RDFMT), "fat") != 0)
-		srv_start("/srv/fat");
-	
-	mount_data();
-#else
-	(void) mount_data;
-#endif
 	
 	srv_start("/srv/input", HID_INPUT);