diff --git a/config/autoload/README.md b/config/autoload/README.md
deleted file mode 100644
index 4e504db024d85325fdc16f0c0d49d61a2649bcd2..0000000000000000000000000000000000000000
--- a/config/autoload/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-About this directory:
-=====================
-
-By default, this application is configured to load all configs in
-`./config/autoload/{,*.}{global,local}.php`. Doing this provides a
-location for a developer to drop in configuration override files provided by
-modules, as well as cleanly provide individual, application-wide config files
-for things like database connections, etc.
diff --git a/config/autoload/database.local.php.dist b/config/autoload/database.local.php.dist
deleted file mode 100644
index b66b81ac06855ec28afc8cac5c4e4b6865898702..0000000000000000000000000000000000000000
--- a/config/autoload/database.local.php.dist
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-return [
-    'doctrine' => [
-        'connection' => [
-            'orm_default' => [
-                'driverClass' => 'Doctrine\DBAL\Driver\OCI8\Driver',
-                'params' => [
-                    'host'     => 'XXXXX',
-                    'dbname'   => 'XXXXX',
-                    'port'     => 'XXXXX',
-                    'user'     => 'XXXXX',
-                    'password' => 'XXXXX',
-                    'charset'  => 'AL32UTF8',
-                ],
-            ],
-        ],
-        'driver'     => [
-            'orm_default_xml_driver' => [
-                'class' => 'Doctrine\ORM\Mapping\Driver\XmlDriver',
-                'cache' => 'array',
-                'paths' => [
-                    __DIR__ . '/../../module/ImportData/src/V1/Entity/Db/Mapping',
-                ],
-            ],
-            'orm_default' => [
-                'class'   => 'Doctrine\ORM\Mapping\Driver\DriverChain',
-                'drivers' => [
-                    'ImportData\V1\Entity\Db' => 'orm_default_xml_driver',
-                ],
-            ],
-        ],
-    ],
-];
diff --git a/config/autoload/global.php b/config/autoload/global.php
index dbfa43dab471cd78b37697a754678ac72879c790..809e9e0cf760ff345f1a88ff1257d86cae3f6e40 100644
--- a/config/autoload/global.php
+++ b/config/autoload/global.php
@@ -5,7 +5,7 @@ return [
     ],
     'db' => [
         'adapters' => [
-//            'dummy' => [],
+            'dummy' => [],
         ],
     ],
 ];
diff --git a/config/autoload/local.php.dist b/config/autoload/local.php.dist
index 79e7412e1d2ad59f3a57471b25fae347214c3a62..148b84d6db6f91ff4434447003e47d19941b4835 100644
--- a/config/autoload/local.php.dist
+++ b/config/autoload/local.php.dist
@@ -1,5 +1,20 @@
 <?php
 return [
+    'doctrine' => [
+        'connection' => [
+            'orm_default' => [
+                'driverClass' => 'Doctrine\DBAL\Driver\OCI8\Driver',
+                'params' => [
+                    'host'     => 'XXXXX',
+                    'dbname'   => 'XXXXX',
+                    'port'     => 'XXXXX',
+                    'user'     => 'XXXXX',
+                    'password' => 'XXXXX',
+                    'charset'  => 'AL32UTF8',
+                ],
+            ],
+        ],
+    ],
     'zf-mvc-auth' => [
         'authentication' => [
             'adapters' => [
diff --git a/module/ImportData/config/module.config.php b/module/ImportData/config/module.config.php
index 1abba9486fee5abed92fb971c5feec6dd2ea4419..841287f7d8557f588e3520c06321c14b51f0864a 100644
--- a/module/ImportData/config/module.config.php
+++ b/module/ImportData/config/module.config.php
@@ -1,4 +1,5 @@
 <?php
+
 return [
     'doctrine' => [
         'driver' => [
@@ -10,7 +11,7 @@ return [
                 ],
             ],
             'orm_default' => [
-                'class' => \Doctrine\ORM\Mapping\Driver\DriverChain::class,
+                'class' => \Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain::class,
                 'drivers' => [
                     'ImportData\\V1\\Entity\\Db' => 'orm_default_xml_driver',
                 ],