diff --git a/app/algorithms/api_ex/run_simulation.py b/app/algorithms/api_ex/run_simulation.py
index 57cbd5e..d410e7a 100644
--- a/app/algorithms/api_ex/run_simulation.py
+++ b/app/algorithms/api_ex/run_simulation.py
@@ -1,6 +1,5 @@
 import numpy as np
 from app.services.tjnetwork import *
-from app.native.wndb.s36_wda_cal import *
 # from get_real_status import *
 from datetime import datetime,timedelta
 from math import modf
diff --git a/app/algorithms/simulations.py b/app/algorithms/simulations.py
index 4f8a6ab..4fbcd9a 100644
--- a/app/algorithms/simulations.py
+++ b/app/algorithms/simulations.py
@@ -9,7 +9,6 @@ from app.algorithms.api_ex.run_simulation import (
     run_simulation_ex,
     from_clock_to_seconds_2,
 )
-from app.native.wndb.project import copy_project
 from app.services.epanet.epanet import Output
 from app.services.scheme_management import store_scheme_info
 from app.services.tjnetwork import *
diff --git a/app/api/v1/endpoints/extension.py b/app/api/v1/endpoints/extension.py
index 5b12e5e..5939f61 100644
--- a/app/api/v1/endpoints/extension.py
+++ b/app/api/v1/endpoints/extension.py
@@ -1,7 +1,7 @@
 from typing import List, Any
 from fastapi import APIRouter, Request, HTTPException
-from app.native.wndb import ChangeSet
 from app.services.tjnetwork import (
+    ChangeSet,
     get_all_extension_data_keys,
     get_all_extension_data,
     get_extension_data,
diff --git a/app/api/v1/endpoints/project.py b/app/api/v1/endpoints/project.py
index 9195276..8faabe7 100644
--- a/app/api/v1/endpoints/project.py
+++ b/app/api/v1/endpoints/project.py
@@ -3,10 +3,10 @@ from fastapi import APIRouter, Request, HTTPException
 from fastapi.responses import PlainTextResponse
 from typing import Any, Dict
 import app.services.project_info as project_info
-from app.native.wndb import ChangeSet
 from app.infra.db.postgresql.database import get_database_instance as get_pg_db
 from app.infra.db.timescaledb.database import get_database_instance as get_ts_db
 from app.services.tjnetwork import (
+    ChangeSet,
     list_project,
     have_project,
     create_project,
diff --git a/app/api/v1/endpoints/scada.py b/app/api/v1/endpoints/scada.py
index 3b09488..dc871a6 100644
--- a/app/api/v1/endpoints/scada.py
+++ b/app/api/v1/endpoints/scada.py
@@ -1,7 +1,7 @@
 from typing import Any
 from fastapi import APIRouter, Request
-from app.native.wndb import ChangeSet
 from app.services.tjnetwork import (
+    ChangeSet,
     get_scada_info,
     get_all_scada_info,
     get_scada_device_schema,
diff --git a/app/api/v1/endpoints/snapshots.py b/app/api/v1/endpoints/snapshots.py
index 8c28337..d8e8dd9 100644
--- a/app/api/v1/endpoints/snapshots.py
+++ b/app/api/v1/endpoints/snapshots.py
@@ -1,6 +1,6 @@
 from fastapi import APIRouter, Request
-from app.native.wndb import ChangeSet
 from app.services.tjnetwork import (
+    ChangeSet,
     get_current_operation,
     execute_undo,
     execute_redo,
diff --git a/app/services/simulation.py b/app/services/simulation.py
index 6dcc976..4f2a41b 100644
--- a/app/services/simulation.py
+++ b/app/services/simulation.py
@@ -1,6 +1,5 @@
 import numpy as np
 from app.services.tjnetwork import *
-from app.native.wndb.s36_wda_cal import *
 
 # from get_real_status import *
 from datetime import datetime, timedelta
diff --git a/app/services/simulation_ops.py b/app/services/simulation_ops.py
index 76c0a0d..57666ec 100644
--- a/app/services/simulation_ops.py
+++ b/app/services/simulation_ops.py
@@ -5,7 +5,6 @@ from math import pi
 import pytz
 
 from app.algorithms.api_ex.run_simulation import run_simulation_ex
-from app.native.wndb.project import copy_project
 from app.services.epanet.epanet import Output
 from app.services.tjnetwork import *
 
diff --git a/app/services/tjnetwork.py b/app/services/tjnetwork.py
index ecb0c70..be1707d 100644
--- a/app/services/tjnetwork.py
+++ b/app/services/tjnetwork.py
@@ -1,5 +1,6 @@
 from typing import Any
 import app.native.wndb as api
+from app.native.wndb.s36_wda_cal import *
 import app.services.epanet as epanet