diff --git a/packages/strapi-ejs/lib/index.js b/packages/strapi-ejs/lib/index.js
index 02122248d2..116ba128c4 100644
--- a/packages/strapi-ejs/lib/index.js
+++ b/packages/strapi-ejs/lib/index.js
@@ -38,7 +38,7 @@ module.exports = function (strapi) {
     initialize: cb => {
       // Force cache mode in production
       if (strapi.config.environment === 'production') {
-        strapi.config.hook.ejs.cache = true;
+        strapi.config.hook.settings.ejs.cache = true;
       }
 
       render(strapi.app, strapi.config.hook.settings.ejs);
diff --git a/packages/strapi-generate-new/files/config/environments/development/hook.json b/packages/strapi-generate-new/files/config/environments/development/hook.json
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/strapi-generate-new/files/config/environments/production/hook.json b/packages/strapi-generate-new/files/config/environments/production/hook.json
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/strapi-generate-new/files/config/environments/test/hook.json b/packages/strapi-generate-new/files/config/environments/test/hook.json
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/strapi-generate-plugin/files/admin/src/containers/NotFoundPage/index.js~74aef739ab1a971f3ff26f018b672577305d21a4 b/packages/strapi-generate-plugin/files/admin/src/containers/NotFoundPage/index.js~74aef739ab1a971f3ff26f018b672577305d21a4
deleted file mode 100644
index 81a6f57e9a..0000000000
--- a/packages/strapi-generate-plugin/files/admin/src/containers/NotFoundPage/index.js~74aef739ab1a971f3ff26f018b672577305d21a4
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * NotFoundPage
- *
- * This is the page we show when the user visits a url that doesn't have a route
- *
- * NOTE: while this component should technically be a stateless functional
- * component (SFC), hot reloading does not currently support SFCs. If hot
- * reloading is not a neccessity for you then you can refactor it and remove
- * the linting exception.
- */
-
-import React from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import messages from './messages';
-
-export default class NotFound extends React.Component {
-  render() {
-    return (
-      <div>
-        <div className="container">
-          <h1>
-            <FormattedMessage {...messages.pageNotFound} />
-          </h1>
-        </div>
-      </div>
-    );
-  }
-}
diff --git a/packages/strapi-generate-plugin/files/admin/src/containers/NotFoundPage/index.js~HEAD b/packages/strapi-generate-plugin/files/admin/src/containers/NotFoundPage/index.js~HEAD
deleted file mode 100644
index 81a6f57e9a..0000000000
--- a/packages/strapi-generate-plugin/files/admin/src/containers/NotFoundPage/index.js~HEAD
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * NotFoundPage
- *
- * This is the page we show when the user visits a url that doesn't have a route
- *
- * NOTE: while this component should technically be a stateless functional
- * component (SFC), hot reloading does not currently support SFCs. If hot
- * reloading is not a neccessity for you then you can refactor it and remove
- * the linting exception.
- */
-
-import React from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import messages from './messages';
-
-export default class NotFound extends React.Component {
-  render() {
-    return (
-      <div>
-        <div className="container">
-          <h1>
-            <FormattedMessage {...messages.pageNotFound} />
-          </h1>
-        </div>
-      </div>
-    );
-  }
-}
diff --git a/packages/strapi-mongoose/lib/index.js b/packages/strapi-mongoose/lib/index.js
index 1e7e6724ff..e991948e3a 100644
--- a/packages/strapi-mongoose/lib/index.js
+++ b/packages/strapi-mongoose/lib/index.js
@@ -46,7 +46,7 @@ module.exports = function (strapi) {
       }
 
       _.forEach(_.pickBy(strapi.config.connections, {connector: 'strapi-mongoose'}), (connection, connectionName) => {
-        const {host, port, username, password, database} = _.defaults(connection.settings, strapi.config.hook.settings);
+        const {host, port, username, password, database} = _.defaults(connection.settings, strapi.config.hook.settings.mongoose);
 
         // Connect to mongo database
         if (_.isEmpty(username) || _.isEmpty(password)) {
diff --git a/packages/strapi-redis/lib/index.js b/packages/strapi-redis/lib/index.js
index f7565315e0..58127871ac 100755
--- a/packages/strapi-redis/lib/index.js
+++ b/packages/strapi-redis/lib/index.js
@@ -51,7 +51,7 @@ module.exports = function(strapi) {
       // For each connection in the config register a new Knex connection.
       _.forEach(connections, (connection, name) => {
         // Apply defaults
-        _.defaults(connection.settings, strapi.hook.redis.defaults);
+        _.defaults(connection.settings, strapi.config.hook.settings.redis);
 
         try {
           const redis = new Redis(_.defaultsDeep({