diff --git a/src/flask_covid19/blueprints/app_web/user_model.py b/src/flask_covid19/blueprints/app_web/user_model.py
index f15590698e51a62d67244915a392667cad62b9cd..6c73ec85c328981174f84464795bb3dbb913001e 100644
--- a/src/flask_covid19/blueprints/app_web/user_model.py
+++ b/src/flask_covid19/blueprints/app_web/user_model.py
@@ -10,8 +10,8 @@ class User(UserMixin, db.Model):
     __tablename__ = 'usr'
 
     id = db.Column(db.Integer, primary_key=True)
-    email = db.Column(db.Unicode, nullable=False, unique=True)
-    password_hash = db.Column(db.String, nullable=False)
+    email = db.Column(db.Unicode(512), nullable=False, unique=True)
+    password_hash = db.Column(db.String(1000), nullable=False)
     name = db.Column(db.String(1000), nullable=False)
 
     def set_password(self, password):
diff --git a/src/flask_covid19/blueprints/data_divi/divi_service_import.py b/src/flask_covid19/blueprints/data_divi/divi_service_import.py
index 29c7a6b0d6e27738c4670d9589df2b768b76f240..f0e99fb0fd50f2ea669bcd7d757357c84c55419e 100644
--- a/src/flask_covid19/blueprints/data_divi/divi_service_import.py
+++ b/src/flask_covid19/blueprints/data_divi/divi_service_import.py
@@ -1,6 +1,6 @@
 import sys
 import csv
-import psycopg2
+# import psycopg2
 
 from database import db, app
 from flask_covid19.blueprints.app_all.all_config import BlueprintConfig
diff --git a/src/flask_covid19/blueprints/data_ecdc/ecdc_service_import.py b/src/flask_covid19/blueprints/data_ecdc/ecdc_service_import.py
index 68c9c7970a7c32da46890da34de73339701408b8..498fd6c77eaf93cd3bf279616aeb27203a13e14d 100644
--- a/src/flask_covid19/blueprints/data_ecdc/ecdc_service_import.py
+++ b/src/flask_covid19/blueprints/data_ecdc/ecdc_service_import.py
@@ -1,5 +1,5 @@
 import csv
-import psycopg2
+# import psycopg2
 
 from database import db, app
 from flask_covid19.blueprints.app_all.all_config import BlueprintConfig
diff --git a/src/flask_covid19/blueprints/data_owid/owid_service_import.py b/src/flask_covid19/blueprints/data_owid/owid_service_import.py
index f96afab5146a4a9619cfaf19bdcc7f682719e353..dbf37c9c673253e589ce007bf1c25b0b06136cf7 100644
--- a/src/flask_covid19/blueprints/data_owid/owid_service_import.py
+++ b/src/flask_covid19/blueprints/data_owid/owid_service_import.py
@@ -1,5 +1,5 @@
 import csv
-import psycopg2
+# import psycopg2
 from database import db, app
 
 from flask_covid19.blueprints.app_all.all_config import BlueprintConfig
diff --git a/src/flask_covid19/blueprints/data_rki/rki_service_import.py b/src/flask_covid19/blueprints/data_rki/rki_service_import.py
index e976e8aa8b80a5ba877f5e25ebba3318d7f9779a..283ed52fb3cfeb73243c3386d52fa07e8f626107 100644
--- a/src/flask_covid19/blueprints/data_rki/rki_service_import.py
+++ b/src/flask_covid19/blueprints/data_rki/rki_service_import.py
@@ -1,5 +1,5 @@
 import csv
-import psycopg2
+# import psycopg2
 
 from database import db, app
 from flask_covid19.blueprints.app_all.all_config import BlueprintConfig
diff --git a/src/flask_covid19/blueprints/data_vaccination/vaccination_service_import.py b/src/flask_covid19/blueprints/data_vaccination/vaccination_service_import.py
index 733ff6b9960438abf14a5189b6128fe7500a0bea..f38562ec41a97991d87c0ac82883568ff3f3fc0f 100644
--- a/src/flask_covid19/blueprints/data_vaccination/vaccination_service_import.py
+++ b/src/flask_covid19/blueprints/data_vaccination/vaccination_service_import.py
@@ -1,5 +1,5 @@
 import csv
-import psycopg2
+# import psycopg2
 
 from database import db, app
 
diff --git a/src/flask_covid19/blueprints/data_who/who_service_import.py b/src/flask_covid19/blueprints/data_who/who_service_import.py
index 3711fb31cc5a56a0069e11825b6e882db247855d..5406f5e9fcb42efef61acff11a79188c7efc9b9d 100644
--- a/src/flask_covid19/blueprints/data_who/who_service_import.py
+++ b/src/flask_covid19/blueprints/data_who/who_service_import.py
@@ -1,6 +1,6 @@
 import sys
 import csv
-import psycopg2
+# import psycopg2
 from database import db, app
 from flask_covid19.blueprints.app_web.web_model_factory import BlueprintDateReportedFactory
 from flask_covid19.blueprints.app_all.all_config import BlueprintConfig