diff --git a/repo/config/config.go b/repo/config/config.go
index d8f5720e5..8c834b415 100644
--- a/repo/config/config.go
+++ b/repo/config/config.go
@@ -18,7 +18,6 @@ var log = logging.Logger("config")
 // Config is used to load IPFS config files.
 type Config struct {
 	Identity         Identity              // local node's peer identity
-	Datastore        Datastore             // local node's storage
 	Addresses        Addresses             // local node's addresses
 	Mounts           Mounts                // local node's mount points
 	Version          Version               // local node's version management
@@ -30,6 +29,8 @@ type Config struct {
 	SupernodeRouting SupernodeClientConfig // local node's routing servers (if SupernodeRouting enabled)
 	API              API                   // local node's API settings
 	Swarm            SwarmConfig
+
+	Datastore Datastore
 }
 
 const (
diff --git a/repo/config/init.go b/repo/config/init.go
index eaa23d285..1835833c5 100644
--- a/repo/config/init.go
+++ b/repo/config/init.go
@@ -11,11 +11,6 @@ import (
 )
 
 func Init(out io.Writer, nBitsForKeypair int) (*Config, error) {
-	ds, err := datastoreConfig()
-	if err != nil {
-		return nil, err
-	}
-
 	identity, err := identityConfig(out, nBitsForKeypair)
 	if err != nil {
 		return nil, err
@@ -47,7 +42,6 @@ func Init(out io.Writer, nBitsForKeypair int) (*Config, error) {
 
 		Bootstrap:        BootstrapPeerStrings(bootstrapPeers),
 		SupernodeRouting: *snr,
-		Datastore:        *ds,
 		Identity:         identity,
 		Discovery: Discovery{MDNS{
 			Enabled:  true,
diff --git a/repo/fsrepo/serialize/serialize.go b/repo/fsrepo/serialize/serialize.go
index 01458fe5d..52186cc23 100644
--- a/repo/fsrepo/serialize/serialize.go
+++ b/repo/fsrepo/serialize/serialize.go
@@ -69,12 +69,5 @@ func Load(filename string) (*config.Config, error) {
 		return nil, err
 	}
 
-	// tilde expansion on datastore path
-	// TODO why is this here??
-	cfg.Datastore.Path, err = util.TildeExpansion(cfg.Datastore.Path)
-	if err != nil {
-		return nil, err
-	}
-
 	return &cfg, err
 }