diff --git a/py-scripts/test_ipv4_connection.py b/py-scripts/test_ipv4_connection.py
index 5c00fdd6..105e611b 100755
--- a/py-scripts/test_ipv4_connection.py
+++ b/py-scripts/test_ipv4_connection.py
@@ -103,7 +103,9 @@ def main():
     station_list = LFUtils.portNameSeries(prefix_="sta", start_id_=0, end_id_=1, padding_number_=10000)
     ip_test = IPv4Test(lfjson_host, lfjson_port, ssid="jedway-wpa2-x2048-4-4", password="jedway-wpa2-x2048-4-4",
                        security="open", sta_list=station_list)
-    ip_test.cleanup(station_list)
+    ip_test.local_realm.remove_all_stations(ip_test.resource)
+    ip_test.local_realm.remove_all_cxs()
+    ip_test.local_realm.remove_all_endps()
     ip_test.timeout = 60
     ip_test.build()
     if not ip_test.passes():
diff --git a/py-scripts/test_ipv4_l4.py b/py-scripts/test_ipv4_l4.py
index a171b779..685b8f68 100755
--- a/py-scripts/test_ipv4_l4.py
+++ b/py-scripts/test_ipv4_l4.py
@@ -146,7 +146,9 @@ def main():
     ip_test = IPV4L4(lfjson_host, lfjson_port, ssid="jedway-wpa2-x2048-4-4", password="jedway-wpa2-x2048-4-4",
                      security="open", station_list=station_list, url="dl http://10.40.0.1 /dev/null", test_duration="5m",
                      requests_per_ten=600)
-    ip_test.cleanup(station_list)
+    ip_test.local_realm.remove_all_stations(ip_test.resource)
+    ip_test.local_realm.remove_all_cxs()
+    ip_test.local_realm.remove_all_endps()
     ip_test.build()
     if not ip_test.passes():
         print(ip_test.get_fail_message())
diff --git a/py-scripts/test_ipv4_l4_urls_per_ten.py b/py-scripts/test_ipv4_l4_urls_per_ten.py
index 0525d5d1..5324dc46 100755
--- a/py-scripts/test_ipv4_l4_urls_per_ten.py
+++ b/py-scripts/test_ipv4_l4_urls_per_ten.py
@@ -140,7 +140,9 @@ def main():
                      security="open", station_list=station_list, url="dl http://10.40.0.1 /dev/null", num_tests=1,
                      target_requests_per_ten=600,
                      requests_per_ten=600)
-    ip_test.cleanup(station_list)
+    ip_test.local_realm.remove_all_stations(ip_test.resource)
+    ip_test.local_realm.remove_all_cxs()
+    ip_test.local_realm.remove_all_endps()
     ip_test.build()
     ip_test.start()
     ip_test.stop()
diff --git a/py-scripts/test_ipv4_variable_time.py b/py-scripts/test_ipv4_variable_time.py
index 0a8a7d5f..6ddb80f3 100755
--- a/py-scripts/test_ipv4_variable_time.py
+++ b/py-scripts/test_ipv4_variable_time.py
@@ -146,7 +146,10 @@ def main():
                                    resource=1,
                                    security="open", test_duration="5m",
                                    side_a_min_rate=256, side_b_min_rate=256)
-    ip_var_test.cleanup(station_list)
+
+    ip_var_test.local_realm.remove_all_stations(ip_var_test.resource)
+    ip_var_test.local_realm.remove_all_cxs()
+    ip_var_test.local_realm.remove_all_endps()
     ip_var_test.build()
     if not ip_var_test.passes():
         print(ip_var_test.get_fail_message())
diff --git a/py-scripts/test_ipv6_connection.py b/py-scripts/test_ipv6_connection.py
index abc69f87..8c4eda8b 100755
--- a/py-scripts/test_ipv6_connection.py
+++ b/py-scripts/test_ipv6_connection.py
@@ -106,7 +106,9 @@ def main():
     station_list = LFUtils.portNameSeries(prefix_="sta", start_id_=0, end_id_=1, padding_number_=10000)
     ipv6_test = IPv6Test(lfjson_host, lfjson_port, ssid="jedway-wpa2-x2048-4-4", password="jedway-wpa2-x2048-4-4",
                        security="open", sta_list=station_list)
-    ipv6_test.cleanup(station_list)
+    ipv6_test.local_realm.remove_all_stations(ipv6_test.resource)
+    ipv6_test.local_realm.remove_all_cxs()
+    ipv6_test.local_realm.remove_all_endps()
     ipv6_test.timeout = 60
     ipv6_test.build()
     if not ipv6_test.passes():
diff --git a/py-scripts/test_ipv6_variable_time.py b/py-scripts/test_ipv6_variable_time.py
index fdfa642c..6a1b36a2 100755
--- a/py-scripts/test_ipv6_variable_time.py
+++ b/py-scripts/test_ipv6_variable_time.py
@@ -147,7 +147,9 @@ def main():
                                    password="jedway-wpa2-x2048-4-4",
                                    resource=1, security="open", test_duration="5m",
                                    side_a_min_rate=256, side_b_min_rate=256)
-    ip_var_test.cleanup(station_list)
+    ip_var_test.local_realm.remove_all_stations(ip_var_test.resource)
+    ip_var_test.local_realm.remove_all_cxs()
+    ip_var_test.local_realm.remove_all_endps()
     ip_var_test.build()
     if not ip_var_test.passes():
         print(ip_var_test.get_fail_message())