diff --git a/src/services/helpers/utilsWrapper.ts b/src/services/helpers/utilsWrapper.ts
index 35698712..fd873b43 100644
--- a/src/services/helpers/utilsWrapper.ts
+++ b/src/services/helpers/utilsWrapper.ts
@@ -3,15 +3,17 @@ import { StateBundler } from "../storage/tlv/stateBundler.js";
 import { TlvStorageFactory } from "../storage/tlv/tlvFilesStorageFactory.js";
 
 export class Utils {
-
+    tlvStorageFactory: TlvStorageFactory
     stateBundler: StateBundler
     settings: MainSettings
-    constructor(settings: MainSettings, tlvStorageFactory: TlvStorageFactory) {
+    constructor(settings: MainSettings) {
         this.settings = settings
-        this.stateBundler = new StateBundler(settings.storageSettings, tlvStorageFactory)
+        this.tlvStorageFactory = new TlvStorageFactory()
+        this.stateBundler = new StateBundler(settings.storageSettings, this.tlvStorageFactory)
     }
 
     Stop() {
         this.stateBundler.Stop()
+        this.tlvStorageFactory.disconnect()
     }
 }
\ No newline at end of file
diff --git a/src/services/main/init.ts b/src/services/main/init.ts
index cc284c88..5f2d4034 100644
--- a/src/services/main/init.ts
+++ b/src/services/main/init.ts
@@ -17,10 +17,9 @@ export type AppData = {
     name: string;
 }
 export const initMainHandler = async (log: PubLogger, mainSettings: MainSettings) => {
-    const tlvStorageFactory = new TlvStorageFactory()
-    const utils = new Utils(mainSettings, tlvStorageFactory)
+    const utils = new Utils(mainSettings)
     const storageManager = new Storage(mainSettings.storageSettings)
-    await storageManager.Connect(log, tlvStorageFactory)
+    await storageManager.Connect(log, utils.tlvStorageFactory)
     /*     const manualMigration = await TypeOrmMigrationRunner(log, storageManager, mainSettings.storageSettings.dbSettings, process.argv[2])
         if (manualMigration) {
             return
diff --git a/src/tests/networkSetup.ts b/src/tests/networkSetup.ts
index ea38131f..3de2a23b 100644
--- a/src/tests/networkSetup.ts
+++ b/src/tests/networkSetup.ts
@@ -10,7 +10,7 @@ export const setupNetwork = async () => {
     await core.InitAddress()
     await core.Mine(1)
     const tlvStorageFactory = new TlvStorageFactory()
-    const setupUtils = new Utils(settings, tlvStorageFactory)
+    const setupUtils = new Utils(settings)
     const alice = new LND(settings.lndSettings, new LiquidityProvider("", setupUtils, async () => { }, async () => { }), setupUtils, async () => { }, async () => { }, () => { }, () => { })
     const bob = new LND({ ...settings.lndSettings, mainNode: settings.lndSettings.otherNode }, new LiquidityProvider("", setupUtils, async () => { }, async () => { }), setupUtils, async () => { }, async () => { }, () => { }, () => { })
     await tryUntil<void>(async i => {
diff --git a/src/tests/testBase.ts b/src/tests/testBase.ts
index d60889a9..2fff9c05 100644
--- a/src/tests/testBase.ts
+++ b/src/tests/testBase.ts
@@ -71,8 +71,7 @@ export const SetupTest = async (d: Describe): Promise<TestBase> => {
     const user1 = { userId: u1.info.userId, appUserIdentifier: u1.identifier, appId: app.appId }
     const user2 = { userId: u2.info.userId, appUserIdentifier: u2.identifier, appId: app.appId }
 
-    const tlvStorageFactory = new TlvStorageFactory()
-    const extermnalUtils = new Utils(settings, tlvStorageFactory)
+    const extermnalUtils = new Utils(settings)
     const externalAccessToMainLnd = new LND(settings.lndSettings, new LiquidityProvider("", extermnalUtils, async () => { }, async () => { }), extermnalUtils, async () => { }, async () => { }, () => { }, () => { })
     await externalAccessToMainLnd.Warmup()