diff --git a/amarillo/plugins/enhancer/configuration.py b/amarillo/plugins/enhancer/configuration.py
index 8bc5ff5..53e4948 100644
--- a/amarillo/plugins/enhancer/configuration.py
+++ b/amarillo/plugins/enhancer/configuration.py
@@ -14,7 +14,9 @@ from amarillo.configuration import configure_services
 
 logger = logging.getLogger(__name__)
 
-def configure_container():
+def configure_enhancer_services():
+    configure_services()
+
     logger.info("Load stops...")
     with open(config.stop_sources_file) as stop_sources_file:
         stop_sources = json.load(stop_sources_file)
@@ -25,14 +27,6 @@ def configure_container():
     container['trips_store'] = trips.TripStore(stop_store)
     container['carpools'] = CarpoolService(container['trips_store'])
 
-def configure_enhancer_services():
-    configure_services()
-
-    # configure_container may have been called already by an exporter, no need to run it again
-    if 'stops_store' not in container:
-        configure_container()
-    else: logger.info("Container already configured")
-
     logger.info("Restore carpools...")
 
     for agency_id in container['agencies'].agencies: