diff --git a/lib/database.js b/lib/database.js
index 4ace0de7e..db04ab9f1 100644
--- a/lib/database.js
+++ b/lib/database.js
@@ -10,19 +10,7 @@ var mongoose = require('mongoose')
   , lib = require('./explorer')
   , settings = require('./settings')
   , fs = require('fs')
-  , async = require('async')
-  , fides = require('./markets/fides')
-  , poloniex = require('./markets/poloniex')
-  , bittrex = require('./markets/bittrex')
-  , bleutrade = require('./markets/bleutrade')
-  , cryptsy = require('./markets/cryptsy')
-  , yobit = require('./markets/yobit')
-  , empoex = require('./markets/empoex')
-  , ccex = require('./markets/ccex')
-  , altmarkets = require('./markets/altmarkets')
-  , crex = require('./markets/crex')
-  , tradesatoshi = require('./markets/tradesatoshi');
-//  , BTC38 = require('./markets/BTC38');
+  , async = require('async');
 
 mongoose.set('useCreateIndex', true);
 mongoose.set('useUnifiedTopology', true);
@@ -173,64 +161,13 @@ function save_tx(txid, blockheight, cb) {
 }
 
 function get_market_data(market, cb) {
-  switch(market) {
-    case 'altmarkets':
-      altmarkets.get_data(settings.markets.coin, settings.markets.exchange, function(err, obj){
-        return cb(err, obj);
-      });
-      break;
-    case 'bittrex':
-      bittrex.get_data(settings.markets.coin, settings.markets.exchange, function(err, obj){
-        return cb(err, obj);
-      });
-      break;
-    case 'bleutrade':
-      bleutrade.get_data(settings.markets.coin, settings.markets.exchange, function(err, obj){
-        return cb(err, obj);
-      });
-      break;
-    case 'fides':
-      fides.get_data(settings.markets.coin, settings.markets.exchange, function(err, obj){
-        return cb(err, obj);
-      });
-      break;
-    case 'poloniex':
-      poloniex.get_data(settings.markets.coin, settings.markets.exchange, function(err, obj){
-        return cb(err, obj);
-      });
-      break;
-    case 'cryptsy':
-      cryptsy.get_data(settings.markets.coin, settings.markets.exchange, settings.markets.cryptsy_id, function(err, obj){
-        return cb(err, obj);
-      });
-      break;
-    case 'ccex':
-      ccex.get_data(settings.markets.coin.toLowerCase(), settings.markets.exchange.toLowerCase(), settings.markets.ccex_key, function (err, obj) {
-        return cb(err, obj);
-      });
-      break;
-    case 'yobit':
-      yobit.get_data(settings.markets.coin.toLowerCase(), settings.markets.exchange.toLowerCase(), function(err, obj){
-        return cb(err, obj);
-      });
-      break;
-    case 'empoex':
-      empoex.get_data(settings.markets.coin, settings.markets.exchange, function(err, obj){
-        return cb(err, obj);
-      });
-      break;
-    case 'crex':
-      crex.get_data(settings.markets.coin, settings.markets.exchange, function (err, obj){
-        return cb(err, obj);
-      });
-      break;
-    case 'tradesatoshi':
-      tradesatoshi.get_data(settings.markets.coin, settings.markets.exchange, function (err, obj){
-        return cb(err, obj);
-      });
-      break;
-    default:
-      return cb(null);
+  if(fs.existsSync('./markets/' + market + '.js')){
+    exMarket = require('./markets/' + market);
+    exMarket.get_data(settings.markets, function(err, obj){
+      return cb(err, obj);
+    });
+  }else{
+    return cb(null);
   }
 }
 
diff --git a/routes/index.js b/routes/index.js
index bfc942cfc..665e70dfd 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -135,7 +135,7 @@ router.get('/markets/:market', function(req, res) {
       /*if (market === 'bittrex') {
         data = JSON.parse(data);
       }*/
-      console.log(data);
+      // console.log(data);
       res.render('./markets/' + market, {
         active: 'markets',
         marketdata: {