diff --git a/bumper/__init__.py b/bumper/__init__.py
index 29cc263..18fc78a 100644
--- a/bumper/__init__.py
+++ b/bumper/__init__.py
@@ -1,10 +1,9 @@
-
 import asyncio
 import importlib
+import logging
 import pkgutil
 import socket
 import sys
-from typing import Optional
 
 from bumper.confserver import ConfServer, WebServerBinding
 from bumper.db import *
diff --git a/bumper/confserver.py b/bumper/confserver.py
index 13dd9d6..2e413ae 100644
--- a/bumper/confserver.py
+++ b/bumper/confserver.py
@@ -14,16 +14,16 @@ import jinja2
 from aiohttp import web
 from aiohttp.typedefs import Handler
 from aiohttp.web_exceptions import (
+    HTTPBadRequest,
     HTTPInternalServerError,
     HTTPNoContent,
-    HTTPBadRequest,
 )
 from aiohttp.web_request import Request
 from aiohttp.web_response import Response, StreamResponse
 
 import bumper
-from .plugins import ConfServerApp
 
+from .plugins import ConfServerApp
 from .util import get_logger
 
 
diff --git a/bumper/db.py b/bumper/db.py
index 5f37b28..977e950 100644
--- a/bumper/db.py
+++ b/bumper/db.py
@@ -1,19 +1,10 @@
-
-import json
-import logging
 import os
 from datetime import datetime, timedelta
 
 from tinydb import Query, TinyDB
 
 import bumper
-from bumper.models import (
-    BumperUser,
-    EcoVacsHomeProducts,
-    OAuth,
-    VacBotClient,
-    VacBotDevice,
-)
+from bumper.models import BumperUser, OAuth, VacBotClient, VacBotDevice
 
 from .util import get_logger
 
diff --git a/bumper/models.py b/bumper/models.py
index 3853011..43980ca 100644
--- a/bumper/models.py
+++ b/bumper/models.py
@@ -1,4 +1,3 @@
-
 import copy
 import json
 import uuid
diff --git a/bumper/mqttserver.py b/bumper/mqttserver.py
index 3cb07bd..32ec602 100644
--- a/bumper/mqttserver.py
+++ b/bumper/mqttserver.py
@@ -1,4 +1,3 @@
-
 """Mqtt module."""
 
 import asyncio
diff --git a/bumper/plugins.py b/bumper/plugins.py
index 877abcb..9517bcd 100644
--- a/bumper/plugins.py
+++ b/bumper/plugins.py
@@ -1,9 +1,3 @@
-
-import asyncio
-
-from aiohttp import web
-
-
 class ConfServerApp:
     name = None
     plugin_type = None
diff --git a/bumper/plugins/bumper_confserver_portal_appsvr.py b/bumper/plugins/bumper_confserver_portal_appsvr.py
index 104c590..77361de 100644
--- a/bumper/plugins/bumper_confserver_portal_appsvr.py
+++ b/bumper/plugins/bumper_confserver_portal_appsvr.py
@@ -1,4 +1,3 @@
-
 import json
 import logging
 
diff --git a/bumper/plugins/bumper_confserver_portal_dim.py b/bumper/plugins/bumper_confserver_portal_dim.py
index 5ff77eb..3b67ee9 100644
--- a/bumper/plugins/bumper_confserver_portal_dim.py
+++ b/bumper/plugins/bumper_confserver_portal_dim.py
@@ -1,15 +1,12 @@
-
-import asyncio
+import json
 import logging
 import random
 import string
-from datetime import datetime, timedelta
 
 from aiohttp import web
 
 import bumper
 from bumper import plugins
-from bumper.models import *
 
 
 class portal_api_dim(plugins.ConfServerApp):
diff --git a/bumper/plugins/bumper_confserver_portal_ecms.py b/bumper/plugins/bumper_confserver_portal_ecms.py
index 145921e..f95be31 100644
--- a/bumper/plugins/bumper_confserver_portal_ecms.py
+++ b/bumper/plugins/bumper_confserver_portal_ecms.py
@@ -1,10 +1,8 @@
-
 import logging
 
 from aiohttp import web
 
 from bumper import plugins
-from bumper.models import *
 
 
 class portal_api_ecms(plugins.ConfServerApp):
diff --git a/bumper/plugins/bumper_confserver_portal_iot.py b/bumper/plugins/bumper_confserver_portal_iot.py
index 5b9b4f5..e2ee907 100644
--- a/bumper/plugins/bumper_confserver_portal_iot.py
+++ b/bumper/plugins/bumper_confserver_portal_iot.py
@@ -1,15 +1,12 @@
-
-import asyncio
+import json
 import logging
 import random
 import string
-from datetime import datetime, timedelta
 
 from aiohttp import web
 
 import bumper
 from bumper import plugins
-from bumper.models import *
 
 
 class portal_api_iot(plugins.ConfServerApp):
diff --git a/bumper/plugins/bumper_confserver_portal_lg.py b/bumper/plugins/bumper_confserver_portal_lg.py
index b63ec99..d6e7be0 100644
--- a/bumper/plugins/bumper_confserver_portal_lg.py
+++ b/bumper/plugins/bumper_confserver_portal_lg.py
@@ -1,4 +1,4 @@
-
+import json
 import logging
 import random
 import string
@@ -6,8 +6,8 @@ import xml.etree.ElementTree as ET
 
 from aiohttp import web
 
+import bumper
 from bumper import plugins
-from bumper.models import *
 
 
 class portal_api_lg(plugins.ConfServerApp):
diff --git a/bumper/plugins/bumper_confserver_portal_neng.py b/bumper/plugins/bumper_confserver_portal_neng.py
index 3f1b0fd..ffbd191 100644
--- a/bumper/plugins/bumper_confserver_portal_neng.py
+++ b/bumper/plugins/bumper_confserver_portal_neng.py
@@ -1,13 +1,8 @@
-
-import asyncio
 import logging
-from datetime import datetime, timedelta
 
 from aiohttp import web
 
-import bumper
 from bumper import plugins
-from bumper.models import *
 
 
 class portal_api_neng(plugins.ConfServerApp):
diff --git a/bumper/plugins/bumper_confserver_portal_pim.py b/bumper/plugins/bumper_confserver_portal_pim.py
index 7919d64..2d28c8b 100644
--- a/bumper/plugins/bumper_confserver_portal_pim.py
+++ b/bumper/plugins/bumper_confserver_portal_pim.py
@@ -1,11 +1,11 @@
-
+import json
 import logging
 import os
 
 from aiohttp import web
 
-from bumper import plugins
-from bumper.models import *
+import bumper
+from bumper import EcoVacsHomeProducts, plugins
 
 
 class portal_api_pim(plugins.ConfServerApp):
diff --git a/bumper/plugins/bumper_confserver_portal_rapp.py b/bumper/plugins/bumper_confserver_portal_rapp.py
index 5fb7f85..7390c41 100644
--- a/bumper/plugins/bumper_confserver_portal_rapp.py
+++ b/bumper/plugins/bumper_confserver_portal_rapp.py
@@ -1,10 +1,8 @@
-
 import logging
 
 from aiohttp import web
 
 from bumper import plugins
-from bumper.models import *
 
 
 class api_rapp(plugins.ConfServerApp):
diff --git a/bumper/plugins/bumper_confserver_portal_users.py b/bumper/plugins/bumper_confserver_portal_users.py
index c61c5d3..ff8ee8d 100644
--- a/bumper/plugins/bumper_confserver_portal_users.py
+++ b/bumper/plugins/bumper_confserver_portal_users.py
@@ -1,13 +1,10 @@
-
-import asyncio
+import json
 import logging
-from datetime import datetime, timedelta
 
 from aiohttp import web
 
 import bumper
 from bumper import plugins
-from bumper.models import *
 
 
 class portal_api_users(plugins.ConfServerApp):
diff --git a/bumper/plugins/bumper_confserver_upload_global.py b/bumper/plugins/bumper_confserver_upload_global.py
index b0422e8..5bd41dd 100644
--- a/bumper/plugins/bumper_confserver_upload_global.py
+++ b/bumper/plugins/bumper_confserver_upload_global.py
@@ -1,14 +1,10 @@
-
-import asyncio
 import logging
 import os
-from datetime import datetime, timedelta
 
 from aiohttp import web
 
 import bumper
 from bumper import plugins
-from bumper.models import *
 
 
 class upload_global(plugins.ConfServerApp):
diff --git a/bumper/plugins/bumper_confserver_v1_global_auth.py b/bumper/plugins/bumper_confserver_v1_global_auth.py
index 9ba16db..f6c2d11 100644
--- a/bumper/plugins/bumper_confserver_v1_global_auth.py
+++ b/bumper/plugins/bumper_confserver_v1_global_auth.py
@@ -1,13 +1,6 @@
-
-import asyncio
-import logging
-from datetime import datetime, timedelta
-
 from aiohttp import web
 
-import bumper
 from bumper import plugins
-from bumper.models import *
 from bumper.rest import auth_util
 
 
diff --git a/bumper/plugins/bumper_confserver_v1_private_ad.py b/bumper/plugins/bumper_confserver_v1_private_ad.py
index 3fd26f8..b9a4294 100644
--- a/bumper/plugins/bumper_confserver_v1_private_ad.py
+++ b/bumper/plugins/bumper_confserver_v1_private_ad.py
@@ -1,13 +1,9 @@
-
-import asyncio
 import logging
-from datetime import datetime, timedelta
 
 from aiohttp import web
 
 import bumper
 from bumper import plugins
-from bumper.models import *
 from bumper.util import get_current_time_as_millis
 
 
diff --git a/bumper/plugins/bumper_confserver_v1_private_campaign.py b/bumper/plugins/bumper_confserver_v1_private_campaign.py
index 5ef0d42..f0173c0 100644
--- a/bumper/plugins/bumper_confserver_v1_private_campaign.py
+++ b/bumper/plugins/bumper_confserver_v1_private_campaign.py
@@ -1,5 +1,3 @@
-
-import asyncio
 import logging
 from datetime import datetime, timedelta
 
@@ -7,8 +5,7 @@ from aiohttp import web
 
 import bumper
 from bumper import plugins
-from bumper.models import *
-from bumper.util import get_current_time_as_millis
+from bumper.util import convert_to_millis, get_current_time_as_millis
 
 
 class v1_private_campaign(plugins.ConfServerApp):
diff --git a/bumper/plugins/bumper_confserver_v1_private_common.py b/bumper/plugins/bumper_confserver_v1_private_common.py
index e227cc8..9e9cdbd 100644
--- a/bumper/plugins/bumper_confserver_v1_private_common.py
+++ b/bumper/plugins/bumper_confserver_v1_private_common.py
@@ -1,10 +1,9 @@
-
 import logging
 
 from aiohttp import web
 
+import bumper
 from bumper import plugins
-from bumper.models import *
 from bumper.util import get_current_time_as_millis
 
 
diff --git a/bumper/plugins/bumper_confserver_v1_private_message.py b/bumper/plugins/bumper_confserver_v1_private_message.py
index 4145211..4c37be7 100644
--- a/bumper/plugins/bumper_confserver_v1_private_message.py
+++ b/bumper/plugins/bumper_confserver_v1_private_message.py
@@ -1,13 +1,9 @@
-
-import asyncio
 import logging
-from datetime import datetime, timedelta
 
 from aiohttp import web
 
 import bumper
 from bumper import plugins
-from bumper.models import *
 from bumper.util import get_current_time_as_millis
 
 
diff --git a/bumper/plugins/bumper_confserver_v1_private_shop.py b/bumper/plugins/bumper_confserver_v1_private_shop.py
index b1b8fee..79a9ecb 100644
--- a/bumper/plugins/bumper_confserver_v1_private_shop.py
+++ b/bumper/plugins/bumper_confserver_v1_private_shop.py
@@ -1,13 +1,9 @@
-
-import asyncio
 import logging
-from datetime import datetime, timedelta
 
 from aiohttp import web
 
 import bumper
 from bumper import plugins
-from bumper.models import *
 from bumper.util import get_current_time_as_millis
 
 
diff --git a/bumper/plugins/bumper_confserver_v1_private_user.py b/bumper/plugins/bumper_confserver_v1_private_user.py
index 64e9751..77787c2 100644
--- a/bumper/plugins/bumper_confserver_v1_private_user.py
+++ b/bumper/plugins/bumper_confserver_v1_private_user.py
@@ -1,13 +1,9 @@
-
-import asyncio
 import logging
-from datetime import datetime, timedelta
 
 from aiohttp import web
 
 import bumper
 from bumper import plugins
-from bumper.models import *
 from bumper.rest import auth_util
 from bumper.util import get_current_time_as_millis
 
diff --git a/bumper/plugins/bumper_confserver_v1_private_userSetting.py b/bumper/plugins/bumper_confserver_v1_private_userSetting.py
index e476a4d..7f1b8a1 100644
--- a/bumper/plugins/bumper_confserver_v1_private_userSetting.py
+++ b/bumper/plugins/bumper_confserver_v1_private_userSetting.py
@@ -1,4 +1,3 @@
-
 import logging
 
 from aiohttp import web
diff --git a/bumper/plugins/bumper_confserver_v2_private_user.py b/bumper/plugins/bumper_confserver_v2_private_user.py
index 1fcffa3..a32bc01 100644
--- a/bumper/plugins/bumper_confserver_v2_private_user.py
+++ b/bumper/plugins/bumper_confserver_v2_private_user.py
@@ -1,4 +1,3 @@
-
 from aiohttp import web
 
 from bumper import plugins
diff --git a/bumper/rest/auth_util.py b/bumper/rest/auth_util.py
index 334fa48..50de071 100644
--- a/bumper/rest/auth_util.py
+++ b/bumper/rest/auth_util.py
@@ -6,11 +6,11 @@ from aiohttp import web
 
 import bumper
 from bumper import (
-    get_logger,
-    EcoVacsHome_Login,
-    EcoVacs_Login,
     API_ERRORS,
     RETURN_API_SUCCESS,
+    EcoVacs_Login,
+    EcoVacsHome_Login,
+    get_logger,
 )
 from bumper.util import get_current_time_as_millis
 
diff --git a/bumper/xmppserver.py b/bumper/xmppserver.py
index 1bfc920..f3d8f75 100644
--- a/bumper/xmppserver.py
+++ b/bumper/xmppserver.py
@@ -1,8 +1,5 @@
-
-
 import asyncio
 import base64
-import logging
 import re
 import ssl
 import uuid
diff --git a/tests/conftest.py b/tests/conftest.py
index 21076c4..2495986 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -5,7 +5,7 @@ from amqtt.client import MQTTClient
 
 import bumper
 from bumper import WebServerBinding
-from tests import HOST, MQTT_PORT, CONF_SERVER_PORT
+from tests import CONF_SERVER_PORT, HOST, MQTT_PORT
 
 
 @pytest.fixture
diff --git a/tests/test_confserver.py b/tests/test_confserver.py
index cc76b2b..e80e0d7 100644
--- a/tests/test_confserver.py
+++ b/tests/test_confserver.py
@@ -5,12 +5,10 @@ import os
 from unittest import mock
 
 import pytest
-from aiohttp import web
-from testfixtures import LogCapture
 
 import bumper
 from bumper import WebServerBinding
-from tests import HOST, MQTT_PORT, CONF_SERVER_PORT
+from tests import CONF_SERVER_PORT, HOST, MQTT_PORT
 
 
 def create_confserver():
diff --git a/tests/test_db.py b/tests/test_db.py
index 3a85467..cfa69cf 100644
--- a/tests/test_db.py
+++ b/tests/test_db.py
@@ -1,14 +1,9 @@
-
-import json
-import logging
 import os
 from datetime import datetime, timedelta
 
-from tinydb import Query, TinyDB
-from tinydb.storages import MemoryStorage
+from tinydb import TinyDB
 
 import bumper
-from bumper.models import BumperUser, EcoVacsHomeProducts, VacBotClient, VacBotDevice
 
 
 def test_db_path():
diff --git a/tests/test_init.py b/tests/test_init.py
index f8a064c..7e234c8 100644
--- a/tests/test_init.py
+++ b/tests/test_init.py
@@ -1,14 +1,7 @@
 import asyncio
-import json
 import os
-import platform
-from unittest import mock
-from unittest.mock import patch
 
-import pytest
 from testfixtures import LogCapture
-from tinydb import Query, TinyDB
-from tinydb.storages import MemoryStorage
 
 import bumper
 
diff --git a/tests/test_mqttserver.py b/tests/test_mqttserver.py
index 3b2c2dc..813a05e 100644
--- a/tests/test_mqttserver.py
+++ b/tests/test_mqttserver.py
@@ -2,7 +2,6 @@ import asyncio
 import os
 import time
 
-import amqtt
 import pytest
 from amqtt.client import MQTTClient
 from amqtt.mqtt.constants import QOS_0
diff --git a/tests/test_xmppserver.py b/tests/test_xmppserver.py
index 2f34381..cd5476c 100644
--- a/tests/test_xmppserver.py
+++ b/tests/test_xmppserver.py
@@ -1,14 +1,6 @@
 import asyncio
-import json
-import os
-import socket
-import ssl
-import xml.etree.ElementTree as ET
 from unittest import mock
 
-import pytest
-import pytest_asyncio
-import tinydb
 from testfixtures import LogCapture
 
 import bumper