diff --git a/lib/cartodb/server.js b/lib/cartodb/server.js
index 826fe2f8..d4866ebc 100644
--- a/lib/cartodb/server.js
+++ b/lib/cartodb/server.js
@@ -41,7 +41,6 @@ var MapConfigNamedLayersAdapter = require('./models/mapconfig/adapter/mapconfig-
 var AnalysisMapConfigAdapter = require('./models/mapconfig/adapter/analysis-mapconfig-adapter');
 var MapConfigOverviewsAdapter = require('./models/mapconfig/adapter/mapconfig-overviews-adapter');
 var TurboCartoAdapter = require('./models/mapconfig/adapter/turbo-carto-adapter');
-
 var MapConfigAdapter = require('./models/mapconfig/adapter');
 
 module.exports = function(serverOptions) {
@@ -155,17 +154,14 @@ module.exports = function(serverOptions) {
     var layergroupAffectedTablesCache = new LayergroupAffectedTablesCache();
     app.layergroupAffectedTablesCache = layergroupAffectedTablesCache;
 
-    var overviewsAdapter = new MapConfigOverviewsAdapter(overviewsMetadataApi, filterStatsApi);
-
     var turboCartoParser = new TurboCartoParser(pgQueryRunner);
-    var turboCartoAdapter = new TurboCartoAdapter(turboCartoParser);
 
     var mapConfigAdapter = new MapConfigAdapter([
         new SqlWrapMapConfigAdapter(),
         new AnalysisMapConfigAdapter(analysisBackend),
         new MapConfigNamedLayersAdapter(templateMaps, pgConnection),
-        overviewsAdapter,
-        turboCartoAdapter
+        new MapConfigOverviewsAdapter(overviewsMetadataApi, filterStatsApi),
+        new TurboCartoAdapter(turboCartoParser)
     ]);
 
     var namedMapProviderCache = new NamedMapProviderCache(