diff --git a/api/__init__.py b/api/__init__.py
index 1bd0975..e8c72de 100644
--- a/api/__init__.py
+++ b/api/__init__.py
@@ -122,14 +122,14 @@ from .s27_backdrop import get_backdrop_schema, get_backdrop, set_backdrop
 
 from .s29_scada_device import SCADA_DEVICE_TYPE_PRESSURE, SCADA_DEVICE_TYPE_DEMAND, SCADA_DEVICE_TYPE_QUALITY, SCADA_DEVICE_TYPE_LEVEL, SCADA_DEVICE_TYPE_FLOW
 from .s29_scada_device import get_scada_device_schema, get_scada_devices, get_scada_device, set_scada_device, add_scada_device, delete_scada_device
-from .batch_api import clean_scada_device
+from .clean_api import clean_scada_device
 
 from .s30_scada_device_data import get_scada_device_data_schema, get_scada_device_data, set_scada_device_data, add_scada_device_data, delete_scada_device_data
-from .batch_api import clean_scada_device_data
+from .clean_api import clean_scada_device_data
 
 from .s31_scada_element import SCADA_MODEL_TYPE_JUNCTION, SCADA_MODEL_TYPE_RESERVOIR, SCADA_MODEL_TYPE_TANK, SCADA_MODEL_TYPE_PIPE, SCADA_MODEL_TYPE_PUMP, SCADA_MODEL_TYPE_VALVE
 from .s31_scada_element import SCADA_ELEMENT_STATUS_OFFLINE, SCADA_ELEMENT_STATUS_ONLINE
 from .s31_scada_element import get_scada_element_schema, get_scada_elements, get_scada_element, set_scada_element, add_scada_element, delete_scada_element
-from .batch_api import clean_scada_element
+from .clean_api import clean_scada_element
 
 from .s37_virtual_district import calculate_virtual_district
\ No newline at end of file
diff --git a/api/batch_api.py b/api/batch_api.py
index a98884d..1c47d54 100644
--- a/api/batch_api.py
+++ b/api/batch_api.py
@@ -1,5 +1,5 @@
 from .sections import *
-from .batch_api_cs import *
+from .database import ChangeSet, API_DELETE, API_UPDATE
 from .batch_exe import execute_batch_command
 
 
@@ -51,15 +51,3 @@ def set_option_ex(name: str, cs: ChangeSet) -> ChangeSet:
 def set_option_v3_ex(name: str, cs: ChangeSet) -> ChangeSet:
     cs.operations[0] |= { 'operation' : API_UPDATE, 'type' : s23_option_v3 }
     return execute_batch_command(name, cs)
-
-
-def clean_scada_device(name: str) -> ChangeSet:
-    return execute_batch_command(name, clean_scada_device_cs(name))
-
-
-def clean_scada_device_data(name: str) -> ChangeSet:
-    return execute_batch_command(name, clean_scada_device_data_cs(name))
-
-
-def clean_scada_element(name: str) -> ChangeSet:
-    return execute_batch_command(name, clean_scada_element_cs(name))
diff --git a/api/clean_api.py b/api/clean_api.py
new file mode 100644
index 0000000..178d380
--- /dev/null
+++ b/api/clean_api.py
@@ -0,0 +1,16 @@
+from .database import ChangeSet
+from .batch_api_cs import clean_scada_device_cs, clean_scada_device_data_cs, clean_scada_element_cs
+from .batch_exe import execute_batch_command
+
+# TODO: merge to batch_api
+
+def clean_scada_device(name: str) -> ChangeSet:
+    return execute_batch_command(name, clean_scada_device_cs(name))
+
+
+def clean_scada_device_data(name: str) -> ChangeSet:
+    return execute_batch_command(name, clean_scada_device_data_cs(name))
+
+
+def clean_scada_element(name: str) -> ChangeSet:
+    return execute_batch_command(name, clean_scada_element_cs(name))