diff --git a/src/flask_covid19/blueprints/app_all/all_views.py b/src/flask_covid19/blueprints/app_all/all_views.py
index 845f1714ef30c8937f14bed06fd4367533357596..2b0652b5a090b0b48bde8746d225ea47f739bc5e 100644
--- a/src/flask_covid19/blueprints/app_all/all_views.py
+++ b/src/flask_covid19/blueprints/app_all/all_views.py
@@ -2,7 +2,7 @@ from flask import render_template, redirect, url_for, flash, Blueprint
 from celery import states
 from celery.utils.log import get_task_logger
 
-from database import app, mq
+from database import app, celery
 from flask_covid19.blueprints.app_web.web_services import app_admin_service, all_data_service
 from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
 
diff --git a/src/flask_covid19/blueprints/data_divi/divi_test_views.py b/src/flask_covid19/blueprints/data_divi/divi_test_views.py
index 6c06b884a748e4e65f8f0bf42c1f7aa7525994c5..81aa95c3dc650e78d7e1428de00b734b63b1f7e1 100644
--- a/src/flask_covid19/blueprints/data_divi/divi_test_views.py
+++ b/src/flask_covid19/blueprints/data_divi/divi_test_views.py
@@ -3,8 +3,6 @@ from celery import states
 from celery.utils.log import get_task_logger
 from flask_login import login_required
 
-from database import app, db
-from flask_covid19.blueprints.app_mq.application_workers import mq
 from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
 
 from flask_covid19.blueprints.data_divi.divi_model_import import DiviImport
@@ -12,7 +10,7 @@ from flask_covid19.blueprints.data_divi.divi_model import DiviData
 
 from flask_covid19.blueprints.app_web.web_services import divi_service
 from flask_covid19.blueprints.data_divi.divi_test_service import DiviTestService
-from flask_covid19.blueprints.data_divi.divi_views import app_divi
+from flask_covid19.blueprints.data_divi.divi_views import app, db, celery, app_divi
 
 divi_test_service = DiviTestService(db, divi_service)
 
diff --git a/src/flask_covid19/blueprints/data_divi/divi_views.py b/src/flask_covid19/blueprints/data_divi/divi_views.py
index 8950f92da516d936f96aafc67d41de227d272afb..0d96bdaaad4c5c9412cc5cc3280b072a733cdd58 100644
--- a/src/flask_covid19/blueprints/data_divi/divi_views.py
+++ b/src/flask_covid19/blueprints/data_divi/divi_views.py
@@ -5,7 +5,7 @@ from celery.utils.log import get_task_logger
 from flask_admin.contrib.sqla import ModelView
 from flask_login import login_required
 
-from database import app, admin, db, mq
+from database import app, admin, db, celery
 
 from flask_covid19.blueprints.app_web.web_services import divi_service
 from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
diff --git a/src/flask_covid19/blueprints/data_ecdc/ecdc_test_views.py b/src/flask_covid19/blueprints/data_ecdc/ecdc_test_views.py
index 4210abaebd597f40e481dc2620ceb986d2d95051..f5b794752ba23cb31cc23a87c20537f8937d637c 100644
--- a/src/flask_covid19/blueprints/data_ecdc/ecdc_test_views.py
+++ b/src/flask_covid19/blueprints/data_ecdc/ecdc_test_views.py
@@ -3,14 +3,12 @@ from celery import states
 from celery.utils.log import get_task_logger
 from flask_login import login_required
 
-from database import app, db
 from flask_covid19.blueprints.app_web.web_services import ecdc_service
-from flask_covid19.blueprints.app_mq.application_workers import mq
 from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
 
 from flask_covid19.blueprints.data_ecdc.ecdc_model_import import EcdcImport
 from flask_covid19.blueprints.data_ecdc.ecdc_test_service import EcdcTestService
-from flask_covid19.blueprints.data_ecdc.ecdc_views import app_ecdc
+from flask_covid19.blueprints.data_ecdc.ecdc_views import app, db, celery, app_ecdc
 
 ecdc_test_service = EcdcTestService(db, ecdc_service)
 
diff --git a/src/flask_covid19/blueprints/data_ecdc/ecdc_views.py b/src/flask_covid19/blueprints/data_ecdc/ecdc_views.py
index aae2abdd3fa5f94b4d1a09e9dd0a62433af49e54..edffff96822a45c14d5a50ff808e832aab297627 100644
--- a/src/flask_covid19/blueprints/data_ecdc/ecdc_views.py
+++ b/src/flask_covid19/blueprints/data_ecdc/ecdc_views.py
@@ -3,7 +3,7 @@ from celery import states
 from celery.utils.log import get_task_logger
 from flask_admin.contrib.sqla import ModelView
 
-from database import admin, db, mq
+from database import app, admin, db, celery
 from flask_covid19.blueprints.app_web.web_services import ecdc_service
 
 from flask_covid19.blueprints.data_ecdc.ecdc_model_import import EcdcImport