diff --git a/config/routes.js b/config/routes.js
index 14cf9aa8..782d46ec 100644
--- a/config/routes.js
+++ b/config/routes.js
@@ -51,6 +51,13 @@ module.exports = function(app) {
   var currency = require('../app/controllers/currency');
   app.get(apiPrefix + '/currency', currency.index);
 
+  // Email store plugin
+  var emailPlugin = require('../plugins/emailstore');
+  app.post(apiPrefix + '/email/register', emailPlugin.post);
+  app.post(apiPrefix + '/email/validate', emailPlugin.validate);
+  app.get(apiPrefix + '/email/retrieve/:email', emailPlugin.get);
+  app.get(apiPrefix + '/email/validate', emailPlugin.validate);
+
   //Home route
   var index = require('../app/controllers/index');
   app.get(apiPrefix + '/version', index.version);
diff --git a/insight.js b/insight.js
index 22d670c1..d5be1f4b 100755
--- a/insight.js
+++ b/insight.js
@@ -143,16 +143,8 @@ if (config.enableMonitor) {
   require('./plugins/monitor').init(config.monitor);
 }
 
-if (config.enableCredentialstore) {
-  require('./plugins/credentialstore').init(expressApp, config.credentialstore);
-}
-
 if (config.enableEmailstore) {
-  require('./plugins/emailstore').init(expressApp, config.emailstore);
-}
-
-if (config.enablePublicInfo) {
-  require('./plugins/publicInfo/publicInfo').init(expressApp, config.emailstore);
+  require('./plugins/emailstore').init(config.emailstore);
 }
 
 // express settings
diff --git a/plugins/emailstore.js b/plugins/emailstore.js
index ba6d43c2..fbddbf2d 100644
--- a/plugins/emailstore.js
+++ b/plugins/emailstore.js
@@ -95,10 +95,9 @@ var makeKey = function(email, key) {
 /**
  * Initializes the plugin
  *
- * @param {Express} expressApp
  * @param {Object} config
  */
-emailPlugin.init = function (expressApp, config) {
+emailPlugin.init = function (config) {
   logger.info('Using emailstore plugin');
 
   var path = globalConfig.leveldb + '/emailstore' + (globalConfig.name ? ('-' + globalConfig.name) : '');
@@ -113,11 +112,6 @@ emailPlugin.init = function (expressApp, config) {
     + globalConfig.apiPrefix
     + '/email/validate'
   );
-
-  expressApp.post(globalConfig.apiPrefix + '/email/register', emailPlugin.post);
-  expressApp.get(globalConfig.apiPrefix + '/email/retrieve/:email', emailPlugin.get);
-  expressApp.post(globalConfig.apiPrefix + '/email/validate', emailPlugin.validate);
-  expressApp.get(globalConfig.apiPrefix + '/email/validate', emailPlugin.validate);
 };
 
 /**