diff --git a/packages/strapi-admin/admin/src/app.js b/packages/strapi-admin/admin/src/app.js
index 49085889c3..d4a5bc0ea5 100644
--- a/packages/strapi-admin/admin/src/app.js
+++ b/packages/strapi-admin/admin/src/app.js
@@ -21,7 +21,6 @@ import {
   unfreezeApp,
   updatePlugin,
   getAppPluginsSucceeded,
-  // unsetHasUserPlugin,
 } from './containers/App/actions';
 import { showNotification } from './containers/NotificationProvider/actions';
 
@@ -49,8 +48,6 @@ const store = configureStore(initialState, history);
 const { dispatch } = store;
 const MOUNT_NODE = document.getElementById('app');
 
-// TODO remove temporary to access the admin
-
 dispatch(getAppPluginsSucceeded(Object.keys(plugins)));
 
 Object.keys(plugins).forEach(plugin => {
diff --git a/packages/strapi-admin/admin/src/appOld.js b/packages/strapi-admin/admin/src/appOld.js
deleted file mode 100644
index 776a0bf669..0000000000
--- a/packages/strapi-admin/admin/src/appOld.js
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * app.js
- *
- * This is the entry file for the application when running the build
- * code.
- */
-
-/* eslint-disable */
-import 'babel-polyfill';
-import { findIndex } from 'lodash';
-import 'sanitize.css/sanitize.css';
-import 'whatwg-fetch';
-import {
-  getAppPluginsSucceeded,
-  unsetHasUserPlugin,
-} from './containers/App/actions';
-import { basename, store } from './createStore';
-import './intlPolyfill';
-import './public-path';
-import './strapi';
-
-const dispatch = store.dispatch;
-
-// Don't inject plugins in development mode.
-if (window.location.port !== '4000') {
-  fetch(`${strapi.remoteURL}/config/plugins.json`, { cache: 'no-cache' })
-    .then(response => {
-      return response.json();
-    })
-    .then(plugins => {
-      dispatch(getAppPluginsSucceeded(plugins));
-
-      if (findIndex(plugins, ['id', 'users-permissions']) === -1) {
-        dispatch(unsetHasUserPlugin());
-      }
-
-      const $body = document.getElementsByTagName('body')[0];
-
-      (plugins || []).forEach(plugin => {
-        const script = document.createElement('script');
-        script.type = 'text/javascript';
-        script.onerror = function(oError) {
-          const source = new URL(oError.target.src);
-          const url = new URL(`${strapi.remoteURL}`);
-
-          if (!source || !url) {
-            throw new Error(`Impossible to load: ${oError.target.src}`);
-          }
-
-          // Remove tag.
-          $body.removeChild(script);
-
-          // New attempt with new src.
-          const newScript = document.createElement('script');
-          newScript.type = 'text/javascript';
-          newScript.src = `${url.origin}${source.pathname}`;
-          $body.appendChild(newScript);
-        };
-
-        script.src =
-          plugin.source[process.env.NODE_ENV].indexOf('://') === -1
-            ? `${basename}${plugin.source[process.env.NODE_ENV]}`.replace(
-                '//',
-                '/',
-              ) // relative
-            : plugin.source[process.env.NODE_ENV]; // absolute
-
-        $body.appendChild(script);
-      });
-    })
-    .catch(err => {
-      console.log(err); // eslint-disable-line no-console
-    });
-}
-
-export { dispatch };
diff --git a/packages/strapi-admin/admin/src/renderApp.js b/packages/strapi-admin/admin/src/renderApp.js
deleted file mode 100644
index 97a087f36e..0000000000
--- a/packages/strapi-admin/admin/src/renderApp.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// /**
-//  * Common configuration for the app in both dev an prod mode
-//  */
-
-// import { Provider } from 'react-redux';
-// import React from 'react';
-// import ReactDOM from 'react-dom';
-// import { ConnectedRouter } from 'react-router-redux';
-// import LanguageProvider from './containers/LanguageProvider';
-// import App from './containers/App';
-// import { history, store } from './createStore';
-
-// const render = translatedMessages => {
-//   ReactDOM.render(
-//     <Provider store={store}>
-//       <LanguageProvider messages={translatedMessages}>
-//         <ConnectedRouter history={history}>
-//           <App store={store} />
-//         </ConnectedRouter>
-//       </LanguageProvider>
-//     </Provider>,
-//     document.getElementById('app'),
-//   );
-// };
-
-// export default render;
diff --git a/packages/strapi-plugin-content-manager/admin/src/index.js b/packages/strapi-plugin-content-manager/admin/src/index.js
index 57b8002290..64b400c02d 100644
--- a/packages/strapi-plugin-content-manager/admin/src/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/index.js
@@ -36,37 +36,6 @@ const translationMessages = reduce(
   },
   {},
 );
-// const layout = (() => {
-//   try {
-//     return require('../../config/layout.js'); // eslint-disable-line import/no-unresolved
-//   } catch (err) {
-//     return null;
-//   }
-// })();
-
-const injectedComponents = (() => {
-  try {
-    return require('./injectedComponents').default; // eslint-disable-line import/no-unresolved
-  } catch (err) {
-    return [];
-  }
-})();
-
-const initializer = (() => {
-  try {
-    return require('./initializer');
-  } catch (err) {
-    return null;
-  }
-})();
-
-const lifecycles = (() => {
-  try {
-    return require('./lifecycles');
-  } catch (err) {
-    return null;
-  }
-})();
 
 function Comp(props) {
   return <App {...props} />;
@@ -78,10 +47,10 @@ const plugin = {
   description: pluginDescription,
   icon: pluginPkg.strapi.icon,
   id: pluginId,
-  initializer,
-  injectedComponents,
+  initializer: require('./initializer'),
+  injectedComponents: require('./injectedComponents').default,
   layout: null,
-  lifecycles,
+  lifecycles: require('./lifecycles'),
   leftMenuLinks: [],
   leftMenuSections: [],
   mainComponent: Comp,
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/index.js b/packages/strapi-plugin-content-type-builder/admin/src/index.js
index 57b8002290..64b400c02d 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/index.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/index.js
@@ -36,37 +36,6 @@ const translationMessages = reduce(
   },
   {},
 );
-// const layout = (() => {
-//   try {
-//     return require('../../config/layout.js'); // eslint-disable-line import/no-unresolved
-//   } catch (err) {
-//     return null;
-//   }
-// })();
-
-const injectedComponents = (() => {
-  try {
-    return require('./injectedComponents').default; // eslint-disable-line import/no-unresolved
-  } catch (err) {
-    return [];
-  }
-})();
-
-const initializer = (() => {
-  try {
-    return require('./initializer');
-  } catch (err) {
-    return null;
-  }
-})();
-
-const lifecycles = (() => {
-  try {
-    return require('./lifecycles');
-  } catch (err) {
-    return null;
-  }
-})();
 
 function Comp(props) {
   return <App {...props} />;
@@ -78,10 +47,10 @@ const plugin = {
   description: pluginDescription,
   icon: pluginPkg.strapi.icon,
   id: pluginId,
-  initializer,
-  injectedComponents,
+  initializer: require('./initializer'),
+  injectedComponents: require('./injectedComponents').default,
   layout: null,
-  lifecycles,
+  lifecycles: require('./lifecycles'),
   leftMenuLinks: [],
   leftMenuSections: [],
   mainComponent: Comp,
diff --git a/packages/strapi-plugin-documentation/admin/src/index.js b/packages/strapi-plugin-documentation/admin/src/index.js
index 57b8002290..07d1bef1af 100644
--- a/packages/strapi-plugin-documentation/admin/src/index.js
+++ b/packages/strapi-plugin-documentation/admin/src/index.js
@@ -36,37 +36,6 @@ const translationMessages = reduce(
   },
   {},
 );
-// const layout = (() => {
-//   try {
-//     return require('../../config/layout.js'); // eslint-disable-line import/no-unresolved
-//   } catch (err) {
-//     return null;
-//   }
-// })();
-
-const injectedComponents = (() => {
-  try {
-    return require('./injectedComponents').default; // eslint-disable-line import/no-unresolved
-  } catch (err) {
-    return [];
-  }
-})();
-
-const initializer = (() => {
-  try {
-    return require('./initializer');
-  } catch (err) {
-    return null;
-  }
-})();
-
-const lifecycles = (() => {
-  try {
-    return require('./lifecycles');
-  } catch (err) {
-    return null;
-  }
-})();
 
 function Comp(props) {
   return <App {...props} />;
@@ -78,10 +47,10 @@ const plugin = {
   description: pluginDescription,
   icon: pluginPkg.strapi.icon,
   id: pluginId,
-  initializer,
-  injectedComponents,
+  initializer: require('./initializer'),
+  injectedComponents: [],
   layout: null,
-  lifecycles,
+  lifecycles: require('./lifecycles'),
   leftMenuLinks: [],
   leftMenuSections: [],
   mainComponent: Comp,
diff --git a/packages/strapi-plugin-email/admin/src/index.js b/packages/strapi-plugin-email/admin/src/index.js
index 57b8002290..64b400c02d 100644
--- a/packages/strapi-plugin-email/admin/src/index.js
+++ b/packages/strapi-plugin-email/admin/src/index.js
@@ -36,37 +36,6 @@ const translationMessages = reduce(
   },
   {},
 );
-// const layout = (() => {
-//   try {
-//     return require('../../config/layout.js'); // eslint-disable-line import/no-unresolved
-//   } catch (err) {
-//     return null;
-//   }
-// })();
-
-const injectedComponents = (() => {
-  try {
-    return require('./injectedComponents').default; // eslint-disable-line import/no-unresolved
-  } catch (err) {
-    return [];
-  }
-})();
-
-const initializer = (() => {
-  try {
-    return require('./initializer');
-  } catch (err) {
-    return null;
-  }
-})();
-
-const lifecycles = (() => {
-  try {
-    return require('./lifecycles');
-  } catch (err) {
-    return null;
-  }
-})();
 
 function Comp(props) {
   return <App {...props} />;
@@ -78,10 +47,10 @@ const plugin = {
   description: pluginDescription,
   icon: pluginPkg.strapi.icon,
   id: pluginId,
-  initializer,
-  injectedComponents,
+  initializer: require('./initializer'),
+  injectedComponents: require('./injectedComponents').default,
   layout: null,
-  lifecycles,
+  lifecycles: require('./lifecycles'),
   leftMenuLinks: [],
   leftMenuSections: [],
   mainComponent: Comp,
diff --git a/packages/strapi-plugin-settings-manager/admin/src/index.js b/packages/strapi-plugin-settings-manager/admin/src/index.js
index 57b8002290..64b400c02d 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/index.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/index.js
@@ -36,37 +36,6 @@ const translationMessages = reduce(
   },
   {},
 );
-// const layout = (() => {
-//   try {
-//     return require('../../config/layout.js'); // eslint-disable-line import/no-unresolved
-//   } catch (err) {
-//     return null;
-//   }
-// })();
-
-const injectedComponents = (() => {
-  try {
-    return require('./injectedComponents').default; // eslint-disable-line import/no-unresolved
-  } catch (err) {
-    return [];
-  }
-})();
-
-const initializer = (() => {
-  try {
-    return require('./initializer');
-  } catch (err) {
-    return null;
-  }
-})();
-
-const lifecycles = (() => {
-  try {
-    return require('./lifecycles');
-  } catch (err) {
-    return null;
-  }
-})();
 
 function Comp(props) {
   return <App {...props} />;
@@ -78,10 +47,10 @@ const plugin = {
   description: pluginDescription,
   icon: pluginPkg.strapi.icon,
   id: pluginId,
-  initializer,
-  injectedComponents,
+  initializer: require('./initializer'),
+  injectedComponents: require('./injectedComponents').default,
   layout: null,
-  lifecycles,
+  lifecycles: require('./lifecycles'),
   leftMenuLinks: [],
   leftMenuSections: [],
   mainComponent: Comp,
diff --git a/packages/strapi-plugin-upload/admin/src/index.js b/packages/strapi-plugin-upload/admin/src/index.js
index 57b8002290..64b400c02d 100644
--- a/packages/strapi-plugin-upload/admin/src/index.js
+++ b/packages/strapi-plugin-upload/admin/src/index.js
@@ -36,37 +36,6 @@ const translationMessages = reduce(
   },
   {},
 );
-// const layout = (() => {
-//   try {
-//     return require('../../config/layout.js'); // eslint-disable-line import/no-unresolved
-//   } catch (err) {
-//     return null;
-//   }
-// })();
-
-const injectedComponents = (() => {
-  try {
-    return require('./injectedComponents').default; // eslint-disable-line import/no-unresolved
-  } catch (err) {
-    return [];
-  }
-})();
-
-const initializer = (() => {
-  try {
-    return require('./initializer');
-  } catch (err) {
-    return null;
-  }
-})();
-
-const lifecycles = (() => {
-  try {
-    return require('./lifecycles');
-  } catch (err) {
-    return null;
-  }
-})();
 
 function Comp(props) {
   return <App {...props} />;
@@ -78,10 +47,10 @@ const plugin = {
   description: pluginDescription,
   icon: pluginPkg.strapi.icon,
   id: pluginId,
-  initializer,
-  injectedComponents,
+  initializer: require('./initializer'),
+  injectedComponents: require('./injectedComponents').default,
   layout: null,
-  lifecycles,
+  lifecycles: require('./lifecycles'),
   leftMenuLinks: [],
   leftMenuSections: [],
   mainComponent: Comp,
diff --git a/packages/strapi-plugin-users-permissions/admin/src/index.js b/packages/strapi-plugin-users-permissions/admin/src/index.js
index 973717dc93..063743c58e 100644
--- a/packages/strapi-plugin-users-permissions/admin/src/index.js
+++ b/packages/strapi-plugin-users-permissions/admin/src/index.js
@@ -36,37 +36,6 @@ const translationMessages = reduce(
   },
   {},
 );
-const layout = (() => {
-  try {
-    return require('../../config/layout.js'); // eslint-disable-line import/no-unresolved
-  } catch (err) {
-    return null;
-  }
-})();
-
-const injectedComponents = (() => {
-  try {
-    return require('./injectedComponents').default; // eslint-disable-line import/no-unresolved
-  } catch (err) {
-    return [];
-  }
-})();
-
-const initializer = (() => {
-  try {
-    return require('./initializer');
-  } catch (err) {
-    return null;
-  }
-})();
-
-const lifecycles = (() => {
-  try {
-    return require('./lifecycles');
-  } catch (err) {
-    return null;
-  }
-})();
 
 function Comp(props) {
   return <App {...props} />;
@@ -78,10 +47,10 @@ const plugin = {
   description: pluginDescription,
   icon: pluginPkg.strapi.icon,
   id: pluginId,
-  initializer,
-  injectedComponents,
-  layout,
-  lifecycles,
+  initializer: require('./initializer'),
+  injectedComponents: require('./injectedComponents').default,
+  layout: require('../../config/layout.js'),
+  lifecycles: require('./lifecycles'),
   leftMenuLinks: [],
   leftMenuSections: [],
   mainComponent: Comp,