diff --git a/src/l3_distributedattackdetector/service/__main__.py b/src/l3_distributedattackdetector/service/__main__.py
index a7ddb6298b629813ab15b1448e1e4bb9b561806b..fe7914dc57f06328ca41ff4a849368f79b6dca37 100644
--- a/src/l3_distributedattackdetector/service/__main__.py
+++ b/src/l3_distributedattackdetector/service/__main__.py
@@ -1,7 +1,6 @@
 import logging, signal, sys, threading, os
 from prometheus_client import start_http_server
 from common.Settings import get_setting
-from common.orm.Factory import get_database_backend as get_database
 from l3_distributedattackdetector.service.l3_distributedattackdetectorService import l3_distributedattackdetectorService
 from l3_distributedattackdetector.Config import GRPC_SERVICE_PORT, GRPC_MAX_WORKERS, GRPC_GRACE_PERIOD, LOG_LEVEL, METRICS_PORT
 
@@ -33,12 +32,9 @@ def main():
     # Start metrics server
     start_http_server(metrics_port)
 
-    # Get database instance
-    database = get_database()
-
     # Starting l3_distributedattackdetector service
     grpc_service = l3_distributedattackdetectorService(
-        database, port=service_port, max_workers=max_workers, grace_period=grace_period)
+        port=service_port, max_workers=max_workers, grace_period=grace_period)
     grpc_service.start()
 
     # Wait for Ctrl+C or termination signal
diff --git a/src/l3_distributedattackdetector/service/l3_distributedattackdetectorService.py b/src/l3_distributedattackdetector/service/l3_distributedattackdetectorService.py
index 6511165203dd92e36c58ca752f2f62d4ca5ab95e..967c703af20afebfe43994283e21f97c7145934f 100644
--- a/src/l3_distributedattackdetector/service/l3_distributedattackdetectorService.py
+++ b/src/l3_distributedattackdetector/service/l3_distributedattackdetectorService.py
@@ -23,13 +23,11 @@ LOGGER = logging.getLogger(__name__)
 class l3_distributedattackdetectorService:
     def __init__(
         self,
-        database,
         address=BIND_ADDRESS,
         port=GRPC_SERVICE_PORT,
         max_workers=GRPC_MAX_WORKERS,
         grace_period=GRPC_GRACE_PERIOD,
     ):
-        self.database = database
         self.address = address
         self.port = port
         self.endpoint = None
@@ -52,7 +50,7 @@ class l3_distributedattackdetectorService:
         self.server = grpc.server(self.pool)  # , interceptors=(tracer_interceptor,))
 
         self.l3_distributedattackdetector_servicer = (
-            l3_distributedattackdetectorServiceServicerImpl(self.database)
+            l3_distributedattackdetectorServiceServicerImpl()
         )
         add_L3CentralizedattackdetectorServicer_to_server(
             self.l3_distributedattackdetector_servicer, self.server
@@ -73,7 +71,7 @@ class l3_distributedattackdetectorService:
         )  # pylint: disable=maybe-no-member
 
         LOGGER.debug("Service started")
-        self.l3_distributedattackdetector_servicer.setupl3_distributedattackdetector(self.database)
+        self.l3_distributedattackdetector_servicer.setupl3_distributedattackdetector()
         LOGGER.debug("IMPL started")
 
     def stop(self):
diff --git a/src/l3_distributedattackdetector/tests/test_unitary.py b/src/l3_distributedattackdetector/tests/test_unitary.py
index 526c6f106d8715017c8efaf491e2a717e7a5a2cb..f751a05eb38bbb1d440ae1a9710c3d0045dd00d7 100644
--- a/src/l3_distributedattackdetector/tests/test_unitary.py
+++ b/src/l3_distributedattackdetector/tests/test_unitary.py
@@ -6,8 +6,6 @@ import os
 import multiprocessing
 from subprocess import Popen, DEVNULL
 from time import sleep
-from l3_distributedattackdetector.proto.monitoring_pb2 import Kpi, KpiList
-from common.orm.Factory import get_database_backend as get_database, BackendEnum as DatabaseEngineEnum
 from l3_distributedattackdetector.Config import GRPC_SERVICE_PORT, GRPC_MAX_WORKERS, GRPC_GRACE_PERIOD
 from l3_distributedattackdetector.client.l3_distributedattackdetectorClient import l3_distributedattackdetectorClient
 from l3_distributedattackdetector.service.l3_distributedattackdetectorService import l3_distributedattackdetectorService
@@ -19,15 +17,9 @@ LOGGER.setLevel(logging.DEBUG)
 
 
 @pytest.fixture(scope='session')
-def database():
-    _database = get_database(engine=DatabaseEngineEnum.INMEMORY)
-    return _database
-
-
-@pytest.fixture(scope='session')
-def l3_distributedattackdetector_service(database):
+def l3_distributedattackdetector_service():
     _service = l3_distributedattackdetectorService(
-        database, port=port, max_workers=GRPC_MAX_WORKERS, grace_period=GRPC_GRACE_PERIOD)
+        port=port, max_workers=GRPC_MAX_WORKERS, grace_period=GRPC_GRACE_PERIOD)
     _service.start()
     yield _service
     _service.stop()
@@ -44,10 +36,10 @@ def test_demo():
     print('Demo Test')
     pass
 
-def test_tstat(database):
+def test_tstat():
     print('Starting DAD')
     _service = l3_distributedattackdetectorService(
-        database, port=port, max_workers=GRPC_MAX_WORKERS, grace_period=GRPC_GRACE_PERIOD)
+        port=port, max_workers=GRPC_MAX_WORKERS, grace_period=GRPC_GRACE_PERIOD)
     p1 = multiprocessing.Process(target=_service.start, args=())
     p1.start()