diff --git a/ci-scripts/xml_files/container_4g_l2sim_tdd_down.xml b/ci-scripts/xml_files/container_4g_l2sim_tdd_down.xml
deleted file mode 100644
index 8ac78f544d..0000000000
--- a/ci-scripts/xml_files/container_4g_l2sim_tdd_down.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-        <htmlTabRef>l2sim-4glte-down</htmlTabRef>
-        <htmlTabName>CleanUp 4G L2 sim - FDD eNB</htmlTabName>
-        <htmlTabIcon>trash</htmlTabIcon>
-        <TestCaseRequestedList>
- 100002
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="100002">
-                <class>Undeploy_Object</class>
-                <desc>Undeploy all OAI 4G stack</desc>
-                <yaml_path>ci-scripts/yaml_files/4g_l2sim_fdd</yaml_path>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
-        </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_down.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_down.xml
deleted file mode 100644
index f7ac0a00d6..0000000000
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_down.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-        <htmlTabRef>rfsim-4glte-fdd05mhz-down</htmlTabRef>
-        <htmlTabName>CleanUp 4G RF</htmlTabName>
-        <htmlTabIcon>trash</htmlTabIcon>
-        <TestCaseRequestedList>
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="100011">
-                <class>Undeploy_Object</class>
-                <desc>Undeploy all OAI 4G stack</desc>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz</yaml_path>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
-        </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1_down.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1_down.xml
deleted file mode 100644
index d1b6d6ab93..0000000000
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1_down.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-        <htmlTabRef>rfsim-4glte-fdd05mhz-nos1-down</htmlTabRef>
-        <htmlTabName>CleanUp 4G RF</htmlTabName>
-        <htmlTabIcon>trash</htmlTabIcon>
-        <TestCaseRequestedList>
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="100011">
-                <class>Undeploy_Object</class>
-                <desc>Undeploy all OAI 4G stack</desc>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1</yaml_path>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
-        </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz_down.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz_down.xml
deleted file mode 100644
index 2cb868e17a..0000000000
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz_down.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-        <htmlTabRef>rfsim-4glte-fdd10mhz-down</htmlTabRef>
-        <htmlTabName>CleanUp 4G RF</htmlTabName>
-        <htmlTabIcon>trash</htmlTabIcon>
-        <TestCaseRequestedList>
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="100011">
-                <class>Undeploy_Object</class>
-                <desc>Undeploy all OAI 4G stack</desc>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz</yaml_path>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
-        </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz_down.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz_down.xml
deleted file mode 100644
index 0582267082..0000000000
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz_down.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-        <htmlTabRef>rfsim-4glte-fdd20mhz-down</htmlTabRef>
-        <htmlTabName>CleanUp 4G RF</htmlTabName>
-        <htmlTabIcon>trash</htmlTabIcon>
-        <TestCaseRequestedList>
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="100011">
-                <class>Undeploy_Object</class>
-                <desc>Undeploy all OAI 4G stack</desc>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz</yaml_path>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
-        </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_4g_rfsim_fembms_down.xml b/ci-scripts/xml_files/container_4g_rfsim_fembms_down.xml
deleted file mode 100644
index d78e9794e0..0000000000
--- a/ci-scripts/xml_files/container_4g_rfsim_fembms_down.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-        <htmlTabRef>rfsim-4glte-fembms-down</htmlTabRef>
-        <htmlTabName>CleanUp 4G RF</htmlTabName>
-        <htmlTabIcon>trash</htmlTabIcon>
-        <TestCaseRequestedList>
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="100011">
-                <class>Undeploy_Object</class>
-                <desc>Undeploy all OAI 4G stack</desc>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_fembms</yaml_path>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
-        </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_4g_rfsim_mbms_down.xml b/ci-scripts/xml_files/container_4g_rfsim_mbms_down.xml
deleted file mode 100644
index 3ad172be93..0000000000
--- a/ci-scripts/xml_files/container_4g_rfsim_mbms_down.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-        <htmlTabRef>rfsim-4glte-mbms-down</htmlTabRef>
-        <htmlTabName>CleanUp 4G RF</htmlTabName>
-        <htmlTabIcon>trash</htmlTabIcon>
-        <TestCaseRequestedList>
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="100011">
-                <class>Undeploy_Object</class>
-                <desc>Undeploy all OAI 4G stack</desc>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_mbms</yaml_path>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
-        </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz_down.xml b/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz_down.xml
deleted file mode 100644
index 0a6d6bb890..0000000000
--- a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz_down.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-        <htmlTabRef>rfsim-4glte-tdd05mhz-down</htmlTabRef>
-        <htmlTabName>CleanUp 4G RF</htmlTabName>
-        <htmlTabIcon>trash</htmlTabIcon>
-        <TestCaseRequestedList>
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="100011">
-                <class>Undeploy_Object</class>
-                <desc>Undeploy all OAI 4G stack</desc>
-                <yaml_path>ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz</yaml_path>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
-        </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_5g_e1_rfsim_down.xml b/ci-scripts/xml_files/container_5g_e1_rfsim_down.xml
deleted file mode 100644
index 3f10e0e32c..0000000000
--- a/ci-scripts/xml_files/container_5g_e1_rfsim_down.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-        <htmlTabRef>rfsim-5gnr-down-e1</htmlTabRef>
-        <htmlTabName>CleanUp E1+F1 split</htmlTabName>
-        <htmlTabIcon>trash</htmlTabIcon>
-        <TestCaseRequestedList>
- 100022
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="100022">
-                <class>Undeploy_Object</class>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_e1</yaml_path>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
-        </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_5g_f1_rfsim_down.xml b/ci-scripts/xml_files/container_5g_f1_rfsim_down.xml
deleted file mode 100644
index 18b917697c..0000000000
--- a/ci-scripts/xml_files/container_5g_f1_rfsim_down.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-        <htmlTabRef>rfsim-5gnr-down-f1</htmlTabRef>
-        <htmlTabName>CleanUp CU-DU F1 split</htmlTabName>
-        <htmlTabIcon>trash</htmlTabIcon>
-        <TestCaseRequestedList>
- 100022
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="100022">
-                <class>Undeploy_Object</class>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_f1_rfsimulator</yaml_path>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
-        </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_5g_fdd_rfsim_down.xml b/ci-scripts/xml_files/container_5g_fdd_rfsim_down.xml
deleted file mode 100644
index 85421f7b6d..0000000000
--- a/ci-scripts/xml_files/container_5g_fdd_rfsim_down.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-        <htmlTabRef>rfsim-5gnr-fdd-down</htmlTabRef>
-        <htmlTabName>CleanUp Monolithic FDD gNB with SDAP</htmlTabName>
-        <htmlTabIcon>trash</htmlTabIcon>
-        <TestCaseRequestedList>
- 100012
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="100012">
-                <class>Undeploy_Object</class>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_fdd_rfsimulator</yaml_path>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
-        </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_5g_l2sim_tdd_down.xml b/ci-scripts/xml_files/container_5g_l2sim_tdd_down.xml
deleted file mode 100644
index 36ce7c71f6..0000000000
--- a/ci-scripts/xml_files/container_5g_l2sim_tdd_down.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-        <htmlTabRef>l2sim-5gnr-down</htmlTabRef>
-        <htmlTabName>CleanUp 5G L2 sim - TDD gNB</htmlTabName>
-        <htmlTabIcon>trash</htmlTabIcon>
-        <TestCaseRequestedList>
- 100002
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="100002">
-                <class>Undeploy_Object</class>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_l2sim_tdd</yaml_path>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
-        </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_5g_rfsim_24prb_down.xml b/ci-scripts/xml_files/container_5g_rfsim_24prb_down.xml
deleted file mode 100644
index 09084b0503..0000000000
--- a/ci-scripts/xml_files/container_5g_rfsim_24prb_down.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-        <htmlTabRef>rfsim-24prb-5gnr-down</htmlTabRef>
-        <htmlTabName>CleanUp Monolithic SA TDD gNB 24PRB</htmlTabName>
-        <htmlTabIcon>trash</htmlTabIcon>
-        <TestCaseRequestedList>
- 100002
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="100002">
-                <class>Undeploy_Object</class>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_24prb</yaml_path>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
-        </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_5g_rfsim_2x2_down.xml b/ci-scripts/xml_files/container_5g_rfsim_2x2_down.xml
deleted file mode 100644
index 5d92987c5b..0000000000
--- a/ci-scripts/xml_files/container_5g_rfsim_2x2_down.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-        <htmlTabRef>rfsim-5gnr-2x2-down</htmlTabRef>
-        <htmlTabName>CleanUp SA Monolithic TDD 2x2 gNB</htmlTabName>
-        <htmlTabIcon>trash</htmlTabIcon>
-        <TestCaseRequestedList>
- 100002
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="100002">
-                <class>Undeploy_Object</class>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_2x2</yaml_path>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
-        </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_5g_rfsim_down.xml b/ci-scripts/xml_files/container_5g_rfsim_down.xml
deleted file mode 100644
index 0c9348e8d6..0000000000
--- a/ci-scripts/xml_files/container_5g_rfsim_down.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-        <htmlTabRef>rfsim-5gnr-down</htmlTabRef>
-        <htmlTabName>CleanUp SA Monolithic TDD gNB</htmlTabName>
-        <htmlTabIcon>trash</htmlTabIcon>
-        <TestCaseRequestedList>
- 100002
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="100002">
-                <class>Undeploy_Object</class>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator</yaml_path>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
-        </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran_down.xml b/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran_down.xml
deleted file mode 100644
index c8960ccae8..0000000000
--- a/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran_down.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-        <htmlTabRef>rfsim-5gnr-down-f1-accelleran</htmlTabRef>
-        <htmlTabName>CleanUp</htmlTabName>
-        <htmlTabIcon>trash</htmlTabIcon>
-        <TestCaseRequestedList>
- 100022
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="100022">
-                <class>Undeploy_Object</class>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_accelleran</yaml_path>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
-        </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest_down.xml b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest_down.xml
deleted file mode 100644
index 14c3f0f32a..0000000000
--- a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest_down.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-        <htmlTabRef>rfsim-5gnr-fdd-phytest-down</htmlTabRef>
-        <htmlTabName>CleanUp Monolithic FDD phytest gNB</htmlTabName>
-        <htmlTabIcon>trash</htmlTabIcon>
-        <TestCaseRequestedList>
- 100012
- 004000
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="100012">
-                <class>Undeploy_Object</class>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest</yaml_path>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="004000">
-            <class>Custom_Command</class>
-            <desc>Clean-Up any residual volume</desc>
-            <node>cacofonix</node>
-            <command>docker volume rm 5g_rfsimulator_fdd_phytest_rrc.config</command>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
-        </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb_down.xml b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb_down.xml
deleted file mode 100644
index 9537b0d5bb..0000000000
--- a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb_down.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-        <htmlTabRef>rfsim-fr2-32prb-5gnr-down</htmlTabRef>
-        <htmlTabName>CleanUp Monolithic FR2 do-ra gNB</htmlTabName>
-        <htmlTabIcon>trash</htmlTabIcon>
-        <TestCaseRequestedList>
- 100002
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="100002">
-                <class>Undeploy_Object</class>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
-        </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_5g_rfsim_ntn_geo_down.xml b/ci-scripts/xml_files/container_5g_rfsim_ntn_geo_down.xml
deleted file mode 100644
index 48b4a67fb2..0000000000
--- a/ci-scripts/xml_files/container_5g_rfsim_ntn_geo_down.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-        <htmlTabRef>rfsim-5gnr-ntn-geo-down</htmlTabRef>
-        <htmlTabName>CleanUp SA Monolithic NTN GEO gNB</htmlTabName>
-        <htmlTabIcon>trash</htmlTabIcon>
-        <TestCaseRequestedList>
- 100002
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="100002">
-                <class>Undeploy_Object</class>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_ntn_geo</yaml_path>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
-        </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_5g_rfsim_sidelink_down.xml b/ci-scripts/xml_files/container_5g_rfsim_sidelink_down.xml
deleted file mode 100644
index 6608ebc572..0000000000
--- a/ci-scripts/xml_files/container_5g_rfsim_sidelink_down.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-        <htmlTabRef>rfsim-5gnr-sidelink-down</htmlTabRef>
-        <htmlTabName>CleanUp sidelink test</htmlTabName>
-        <htmlTabIcon>trash</htmlTabIcon>
-        <TestCaseRequestedList>
- 100002
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="100002">
-                <class>Undeploy_Object</class>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_sidelink</yaml_path>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
-        </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora_down.xml b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora_down.xml
deleted file mode 100644
index 35ebe2314a..0000000000
--- a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora_down.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-        <htmlTabRef>rfsim-tdd-dora-5gnr-down</htmlTabRef>
-        <htmlTabName>CleanUp Monolithic do-ra TDD gNB</htmlTabName>
-        <htmlTabIcon>trash</htmlTabIcon>
-        <TestCaseRequestedList>
- 100002
- 004000
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="100002">
-                <class>Undeploy_Object</class>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_tdd_dora</yaml_path>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-	<testCase id="004000">
-            <class>Custom_Command</class>
-            <desc>Clean-Up any residual volume</desc>
-            <node>cacofonix</node>
-            <command>docker volume rm 5g_rfsimulator_tdd_dora_rrc.config</command>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
-        </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb_down.xml b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb_down.xml
deleted file mode 100644
index 78b9aacc95..0000000000
--- a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb_down.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-        <htmlTabRef>rfsim-5gnr-u0-25prb-down</htmlTabRef>
-        <htmlTabName>CleanUp SA Monolithic FDD u0 25PRB gNB</htmlTabName>
-        <htmlTabIcon>trash</htmlTabIcon>
-        <TestCaseRequestedList>
- 100002
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="100002">
-                <class>Undeploy_Object</class>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
-        </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml
index 54261b3505..607c1ebcdd 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml
@@ -36,6 +36,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
 040301 040501 040603 040604 040605 040606 040607 040641 040642 040643 040644 040401 040201
 030201
 200000
+222222
     </TestCaseRequestedList>
     <TestCaseExclusionList></TestCaseExclusionList>
 
@@ -206,5 +207,12 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
         <svr_id>ltebox-nano</svr_id>
     </testCase>
 
+    <testCase id="222222">
+        <class>Clean_Test_Server_Images</class>
+        <always_exec>true</always_exec>
+        <desc>Clean Test Images on Test Server</desc>
+        <test_svr_id>0</test_svr_id>
+    </testCase>
+
 </testCaseList>
 
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml
index 3c47ffce7b..53eec11f20 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml
@@ -35,6 +35,7 @@
 040301 040531 040633 040634 040636 040671 040672 040673 040401 040201
 030231
 200000
+222222
     </TestCaseRequestedList>
     <TestCaseExclusionList></TestCaseExclusionList>
 
@@ -189,4 +190,11 @@
         <svr_id>ltebox-nano</svr_id>
     </testCase>
 
+    <testCase id="222222">
+        <class>Clean_Test_Server_Images</class>
+        <always_exec>true</always_exec>
+        <desc>Clean Test Images on Test Server</desc>
+        <test_svr_id>0</test_svr_id>
+    </testCase>
+
 </testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml
index 2674c4198d..669f46f2ec 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml
@@ -35,6 +35,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
 000010 040301 040502 000011 040302 000001 000012 040303 000002 000013 040503 040401 040201
 030202
 200000
+222222
     </TestCaseRequestedList>
     <TestCaseExclusionList></TestCaseExclusionList>
 
@@ -171,5 +172,12 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
         <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
+    <testCase id="222222">
+        <class>Clean_Test_Server_Images</class>
+        <always_exec>true</always_exec>
+        <desc>Clean Test Images on Test Server</desc>
+        <test_svr_id>0</test_svr_id>
+    </testCase>
+
 </testCaseList>
 
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml
index ea95961cba..2aa378b223 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml
@@ -37,6 +37,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
 040301 040511 040613 040614 040615 040651 040652 040653 040654 040401 040201
 030211
 200000
+222222
     </TestCaseRequestedList>
     <TestCaseExclusionList></TestCaseExclusionList>
 
@@ -201,5 +202,12 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <svr_id>ltebox-nano</svr_id>
     </testCase>
 
+    <testCase id="222222">
+        <class>Clean_Test_Server_Images</class>
+        <always_exec>true</always_exec>
+        <desc>Clean Test Images on Test Server</desc>
+        <test_svr_id>0</test_svr_id>
+    </testCase>
+
 </testCaseList>
 
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml
index 9f927db4d4..55653d6e4a 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml
@@ -36,6 +36,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
 040201
 030212
 200000
+222222
     </TestCaseRequestedList>
     <TestCaseExclusionList></TestCaseExclusionList>
 
@@ -133,5 +134,12 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <svr_id>ltebox-nano</svr_id>
     </testCase>
 
+    <testCase id="222222">
+        <class>Clean_Test_Server_Images</class>
+        <always_exec>true</always_exec>
+        <desc>Clean Test Images on Test Server</desc>
+        <test_svr_id>0</test_svr_id>
+    </testCase>
+
 </testCaseList>
 
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue_cleanup.xml b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue_cleanup.xml
deleted file mode 100644
index 03d502fe14..0000000000
--- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue_cleanup.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-    <htmlTabRef>images-clean-up</htmlTabRef>
-    <htmlTabName>Images Clean-Up</htmlTabName>
-    <htmlTabIcon>trash</htmlTabIcon>
-    <TestCaseRequestedList>
-000000
-111111
-222222
-333333
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
-
-    <testCase id="000000">
-        <class>Undeploy_Object</class>
-        <desc>Undeploy eNB</desc>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_magma</yaml_path>
-        <eNB_instance>0</eNB_instance>
-        <eNB_serverId>0</eNB_serverId>
-    </testCase>
-
-    <testCase id="111111">
-        <class>Undeploy_Object</class>
-        <desc>Undeploy LTE-UE</desc>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_oai_ue_magma</yaml_path>
-        <eNB_instance>1</eNB_instance>
-        <eNB_serverId>1</eNB_serverId>
-    </testCase>
-
-    <testCase id="222222">
-        <class>Clean_Test_Server_Images</class>
-        <desc>Clean Test Images on eNB Test Server</desc>
-        <test_svr_id>0</test_svr_id>
-    </testCase>
-
-    <testCase id="333333">
-        <class>Clean_Test_Server_Images</class>
-        <desc>Clean Test Images on LTE-UE Test Server</desc>
-        <test_svr_id>1</test_svr_id>
-    </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml
index 07960f3a37..61fa2dea11 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml
@@ -36,6 +36,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
 040301 040521 040623 040624 040625 040662 040401 040201
 030221
 200000
+222222
     </TestCaseRequestedList>
     <TestCaseExclusionList></TestCaseExclusionList>
 
@@ -201,5 +202,12 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <svr_id>ltebox-nano</svr_id>
     </testCase>
 
+    <testCase id="222222">
+        <class>Clean_Test_Server_Images</class>
+        <always_exec>true</always_exec>
+        <desc>Clean Test Images on Test Server</desc>
+        <test_svr_id>0</test_svr_id>
+    </testCase>
+
 </testCaseList>
 
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_cleanup.xml b/ci-scripts/xml_files/container_lte_b200_fdd_cleanup.xml
deleted file mode 100644
index bc9d2cb361..0000000000
--- a/ci-scripts/xml_files/container_lte_b200_fdd_cleanup.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-        <htmlTabRef>test-fdd-cleanup</htmlTabRef>
-        <htmlTabName>CleanUp 4G LTE FDD</htmlTabName>
-        <htmlTabIcon>trash</htmlTabIcon>
-        <TestCaseRequestedList>
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
-        </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml
index 52a8df3146..76bd380f4f 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml
@@ -36,6 +36,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
 040301 040501 040602 040601 040603 040604 040605 040642 040641 040643 040644 040645 040401 040201
 030204
 200000
+222222
     </TestCaseRequestedList>
     <TestCaseExclusionList></TestCaseExclusionList>
 
@@ -218,4 +219,11 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
         <svr_id>ltebox-nano</svr_id>
     </testCase>
 
+    <testCase id="222222">
+        <class>Clean_Test_Server_Images</class>
+        <always_exec>true</always_exec>
+        <desc>Clean Test Images on Test Server</desc>
+        <test_svr_id>0</test_svr_id>
+    </testCase>
+
 </testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml
index 62c5e5e476..ec280240e0 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml
@@ -34,6 +34,7 @@
 040301 040532 040631 040632 040634 040635 040681 040682 040684 040685 040401 040201
 030231
 200000
+222222
     </TestCaseRequestedList>
     <TestCaseExclusionList></TestCaseExclusionList>
 
@@ -204,4 +205,11 @@
         <svr_id>ltebox-nano</svr_id>
     </testCase>
 
+    <testCase id="222222">
+        <class>Clean_Test_Server_Images</class>
+        <always_exec>true</always_exec>
+        <desc>Clean Test Images on Test Server</desc>
+        <test_svr_id>0</test_svr_id>
+    </testCase>
+
 </testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml
index 574e75d780..7218dcc576 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml
@@ -35,6 +35,7 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
 040301 040511 040612 040611 040613 040614 040615 040652 040651 040653 040654 040655 040401 040201
 030214
 200000
+222222
     </TestCaseRequestedList>
     <TestCaseExclusionList></TestCaseExclusionList>
 
@@ -209,4 +210,11 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
         <svr_id>ltebox-nano</svr_id>
     </testCase>
 
+    <testCase id="222222">
+        <class>Clean_Test_Server_Images</class>
+        <always_exec>true</always_exec>
+        <desc>Clean Test Images on Test Server</desc>
+        <test_svr_id>0</test_svr_id>
+    </testCase>
+
 </testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml
index 516bc48444..4ed3e89e59 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml
@@ -35,6 +35,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
 040301 040521 040622 040621 040623 040662 040401 040201
 030224
 200000
+222222
     </TestCaseRequestedList>
     <TestCaseExclusionList></TestCaseExclusionList>
 
@@ -207,4 +208,11 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
         <svr_id>ltebox-nano</svr_id>
     </testCase>
 
+    <testCase id="222222">
+        <class>Clean_Test_Server_Images</class>
+        <always_exec>true</always_exec>
+        <desc>Clean Test Images on Test Server</desc>
+        <test_svr_id>0</test_svr_id>
+    </testCase>
+
 </testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml
index 8156eb517d..9ae77ccec3 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml
@@ -35,6 +35,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
 040301 040522 040627 040626 040628 040629 040630 040667 040666 040668 040669 040670 040401 040201
 030225
 200000
+222222
     </TestCaseRequestedList>
     <TestCaseExclusionList></TestCaseExclusionList>
 
@@ -212,4 +213,11 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
         <svr_id>ltebox-nano</svr_id>
     </testCase>
 
+    <testCase id="222222">
+        <class>Clean_Test_Server_Images</class>
+        <always_exec>true</always_exec>
+        <desc>Clean Test Images on Test Server</desc>
+        <test_svr_id>0</test_svr_id>
+    </testCase>
+
 </testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_cleanup.xml b/ci-scripts/xml_files/container_lte_b200_tdd_cleanup.xml
deleted file mode 100644
index 671ef0e5f4..0000000000
--- a/ci-scripts/xml_files/container_lte_b200_tdd_cleanup.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-        <htmlTabRef>test-tdd-cleanup</htmlTabRef>
-        <htmlTabName>CleanUp 4G LTE TDD</htmlTabName>
-        <htmlTabIcon>trash</htmlTabIcon>
-        <TestCaseRequestedList>
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
-        </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_cleanup.xml b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_cleanup.xml
deleted file mode 100644
index 01c89ae585..0000000000
--- a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_cleanup.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-    <htmlTabRef>images-clean-up</htmlTabRef>
-    <htmlTabName>Images Clean-Up</htmlTabName>
-    <htmlTabIcon>trash</htmlTabIcon>
-    <TestCaseRequestedList>
-111111
-222222
-333333
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
-
-    <testCase id="111111">
-      <class>Detach_UE</class>
-      <desc>Detach UE</desc>
-      <id>up2</id>
-    </testCase>
-
-    <testCase id="222222">
-        <class>Undeploy_Object</class>
-        <desc>Undeploy eNB</desc>
-        <yaml_path>ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2</yaml_path>
-        <eNB_instance>0</eNB_instance>
-        <eNB_serverId>0</eNB_serverId>
-    </testCase>
-
-    <testCase id="333333">
-        <class>Clean_Test_Server_Images</class>
-        <desc>Clean Test Images</desc>
-        <test_svr_id>0</test_svr_id>
-    </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_nsa_b200_terminate.xml b/ci-scripts/xml_files/container_nsa_b200_terminate.xml
deleted file mode 100644
index b470cfb8b4..0000000000
--- a/ci-scripts/xml_files/container_nsa_b200_terminate.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-	<htmlTabRef>TEST-NSA-FR1-TM1-B200-terminate</htmlTabRef>
-	<htmlTabName>NSA tear-down in case of problem</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<TestCaseRequestedList>
- 010001
- 010002
- 030202
- 030201
- 222220
- 222221
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-    <testCase id= "010001">
-      <class>Detach_UE</class>
-      <desc>Detach UE</desc>
-      <id>idefix</id>
-    </testCase>
-    <testCase id="010002">
-      <class>Terminate_UE</class>
-      <desc>Terminate Quectel</desc>
-      <id>idefix</id>
-    </testCase>
-
-    <testCase id="030201">
-        <class>Undeploy_Object</class>
-        <desc>Undeploy eNB</desc>
-		<yaml_path>ci-scripts/yaml_files/nsa_b200_enb</yaml_path>
-        <eNB_instance>0</eNB_instance>
-        <eNB_serverId>0</eNB_serverId>
-    </testCase>
-
-    <testCase id="030202">
-        <class>Undeploy_Object</class>
-        <desc>Undeploy gNB</desc>
-		<yaml_path>ci-scripts/yaml_files/nsa_b200_gnb</yaml_path>
-        <eNB_instance>1</eNB_instance>
-        <eNB_serverId>1</eNB_serverId>
-    </testCase>
-
-	<testCase id="222220">
-		<class>Clean_Test_Server_Images</class>
-		<desc>Clean Test Images on Test Server</desc>
-		<test_svr_id>0</test_svr_id>
-	</testCase>
-
-	<testCase id="222221">
-		<class>Clean_Test_Server_Images</class>
-		<desc>Clean Test Images on Test Server</desc>
-		<test_svr_id>1</test_svr_id>
-	</testCase>
-
-</testCaseList>
-
diff --git a/ci-scripts/xml_files/container_sa_aerial_quectel_cleanup.xml b/ci-scripts/xml_files/container_sa_aerial_quectel_cleanup.xml
deleted file mode 100644
index 4a8a88fd8a..0000000000
--- a/ci-scripts/xml_files/container_sa_aerial_quectel_cleanup.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-  <htmlTabRef>test-aerial-cleanup</htmlTabRef>
-  <htmlTabName>CleanUp AERIAL</htmlTabName>
-  <htmlTabIcon>trash</htmlTabIcon>
-  <TestCaseRequestedList>
-    000000
-    111111
-    222222
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id="000000">
-    <class>Undeploy_Object</class>
-    <desc>Undeploy gNB</desc>
-    <yaml_path>ci-scripts/yaml_files/sa_gnb_aerial</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-  </testCase>
-
-  <testCase id="111111">
-    <class>Clean_Test_Server_Images</class>
-    <desc>Clean Test Images on Test Server</desc>
-    <test_svr_id>0</test_svr_id>
-  </testCase>
-
-  <testCase id="222222">
-    <class>Detach_UE</class>
-    <desc>Terminate UE</desc>
-    <id>up2-aerial</id>
-  </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_sa_aw2s_asue_cleanup.xml b/ci-scripts/xml_files/container_sa_aw2s_asue_cleanup.xml
deleted file mode 100644
index 0b90afeee3..0000000000
--- a/ci-scripts/xml_files/container_sa_aw2s_asue_cleanup.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-  <htmlTabRef>test-aw2s-cleanup</htmlTabRef>
-  <htmlTabName>CleanUp AW2S ASUE</htmlTabName>
-  <htmlTabIcon>trash</htmlTabIcon>
-  <TestCaseRequestedList>
-    111111
-    222222
-    333333
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id="111111">
-    <class>Terminate_UE</class>
-    <desc>Terminate UE</desc>
-    <id>amarisoft_ue</id>
-  </testCase>
-
-  <testCase id="222222">
-    <class>Undeploy_Object</class>
-    <desc>Undeploy gNB</desc>
-    <yaml_path>ci-scripts/yaml_files/sa_aw2s_gnb</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-  </testCase>
-
-  <testCase id="333333">
-    <class>Clean_Test_Server_Images</class>
-    <desc>Clean Test Images on Test Server</desc>
-    <test_svr_id>0</test_svr_id>
-  </testCase>
-
-</testCaseList>
-
diff --git a/ci-scripts/xml_files/container_sa_b200_terminate.xml b/ci-scripts/xml_files/container_sa_b200_terminate.xml
deleted file mode 100644
index 2d7872e8d8..0000000000
--- a/ci-scripts/xml_files/container_sa_b200_terminate.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-  <htmlTabRef>TEST-SA-FR1-B200-terminate</htmlTabRef>
-  <htmlTabName>Tear-down</htmlTabName>
-  <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
-  010001
-  010002
-  030201
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id= "010001">
-    <class>Detach_UE</class>
-    <desc>Detach UE</desc>
-    <id>idefix</id>
-  </testCase>
-  <testCase id="010002">
-    <class>Terminate_UE</class>
-    <desc>Terminate Quectel</desc>
-    <id>idefix</id>
-  </testCase>
-
-  <testCase id="030201">
-    <class>Undeploy_Object</class>
-    <desc>Undeploy gNB</desc>
-    <yaml_path>ci-scripts/yaml_files/sa_b200_gnb</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-  </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_sa_e1_b200_terminate.xml b/ci-scripts/xml_files/container_sa_e1_b200_terminate.xml
deleted file mode 100644
index 811b047a4a..0000000000
--- a/ci-scripts/xml_files/container_sa_e1_b200_terminate.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-  <htmlTabRef>TEST-SA-FR1-F1-E1-B200-terminate</htmlTabRef>
-  <htmlTabName>Tear-down</htmlTabName>
-  <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
-  010001
-  010002
-  330201
-  222222
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id= "010001">
-    <class>Detach_UE</class>
-    <desc>Detach UE</desc>
-    <id>idefix</id>
-  </testCase>
-  <testCase id="010002">
-    <class>Terminate_UE</class>
-    <desc>Terminate Quectel</desc>
-    <id>idefix</id>
-  </testCase>
-
-  <testCase id="330201">
-    <class>Undeploy_Object</class>
-    <desc>Undeploy CU-CP/CU-UP/DU</desc>
-    <yaml_path>ci-scripts/yaml_files/sa_e1_b200_gnb</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-  </testCase>
-
-  <testCase id="222222">
-    <class>Clean_Test_Server_Images</class>
-    <desc>Clean Test Images on Test Server</desc>
-    <test_svr_id>0</test_svr_id>
-  </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_sa_f1_b200_terminate.xml b/ci-scripts/xml_files/container_sa_f1_b200_terminate.xml
deleted file mode 100644
index 92e5472c85..0000000000
--- a/ci-scripts/xml_files/container_sa_f1_b200_terminate.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-  <htmlTabRef>TEST-SA-FR1-F1-B200-terminate</htmlTabRef>
-  <htmlTabName>Tear-down</htmlTabName>
-  <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
-  010001
-  010002
-  230201
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id= "010001">
-    <class>Detach_UE</class>
-    <desc>Detach UE</desc>
-    <id>idefix</id>
-  </testCase>
-  <testCase id="010002">
-    <class>Terminate_UE</class>
-    <desc>Terminate Quectel</desc>
-    <id>idefix</id>
-  </testCase>
-
-  <testCase id="230201">
-    <class>Undeploy_Object</class>
-    <desc>Undeploy CU-DU</desc>
-    <yaml_path>ci-scripts/yaml_files/sa_f1_b200_gnb</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-  </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2_cleanup.xml b/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2_cleanup.xml
deleted file mode 100644
index 1a9aecfc8a..0000000000
--- a/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2_cleanup.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-  <htmlTabRef>cleanup-fhi72-vvdn</htmlTabRef>
-  <htmlTabName>Cleanup VVDN</htmlTabName>
-  <htmlTabIcon>trash</htmlTabIcon>
-  <TestCaseRequestedList>
-    555555
-    666666
-    777777
-    888888
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id="555555">
-    <class>Detach_UE</class>
-    <desc>Detach UE</desc>
-    <id>up2-fhi72</id>
-  </testCase>
-
-  <testCase id="666666">
-    <class>Undeploy_Object</class>
-    <desc>Undeploy gNB</desc>
-    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-  </testCase>
-
-  <testCase id="777777">
-    <class>Clean_Test_Server_Images</class>
-    <desc>Clean Test Images on Test Server</desc>
-    <test_svr_id>0</test_svr_id>
-  </testCase>
-
-  <testCase id="888888">
-    <class>Custom_Command</class>
-    <desc>Set CPU to idle state, set kernel parameters to default values</desc>
-    <node>cacofonix</node>
-    <command>/opt/FHI7.2/setup_cleanup.sh</command>
-    <command_fail>yes</command_fail>
-  </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_sa_n310_2X2_100MHz_cleanup.xml b/ci-scripts/xml_files/container_sa_n310_2X2_100MHz_cleanup.xml
deleted file mode 100644
index eb62cdbdd3..0000000000
--- a/ci-scripts/xml_files/container_sa_n310_2X2_100MHz_cleanup.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-  <htmlTabRef>test-cleanup</htmlTabRef>
-  <htmlTabName>CleanUp SA 2x2</htmlTabName>
-  <htmlTabIcon>trash</htmlTabIcon>
-  <TestCaseRequestedList>
-    011111
-    022222
-    033333
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id="011111">
-    <class>Detach_UE</class>
-    <desc>Detach UE</desc>
-    <id>up2</id>
-  </testCase>
-
-  <testCase id="022222">
-    <class>Undeploy_Object</class>
-    <desc>Undeploy gNB</desc>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_2x2_100MHz</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-    <services>oai-gnb</services>
-  </testCase>
-
-  <testCase id="033333">
-    <class>Clean_Test_Server_Images</class>
-    <desc>Clean Test Images on Test Server</desc>
-    <test_svr_id>0</test_svr_id>
-  </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_cleanup.xml b/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_cleanup.xml
deleted file mode 100644
index 3efd2f7be8..0000000000
--- a/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_cleanup.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-  <htmlTabRef>test-cleanup</htmlTabRef>
-  <htmlTabName>CleanUp SA 2x2</htmlTabName>
-  <htmlTabIcon>trash</htmlTabIcon>
-  <TestCaseRequestedList>
-    111111
-    222222
-    333333
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id="111111">
-    <class>Detach_UE</class>
-    <desc>Detach UE</desc>
-    <id>up2</id>
-  </testCase>
-
-  <testCase id="222222">
-    <class>Undeploy_Object</class>
-    <desc>Undeploy gNB</desc>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_2x2_60MHz</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-    <services>oai-gnb</services>
-  </testCase>
-
-  <testCase id="333333">
-    <class>Clean_Test_Server_Images</class>
-    <desc>Clean Test Images on Test Server</desc>
-    <test_svr_id>0</test_svr_id>
-  </testCase>
-
-</testCaseList>
diff --git a/ci-scripts/xml_files/container_sa_n310_nrue_cleanup.xml b/ci-scripts/xml_files/container_sa_n310_nrue_cleanup.xml
deleted file mode 100644
index 035e38a40d..0000000000
--- a/ci-scripts/xml_files/container_sa_n310_nrue_cleanup.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-  <htmlTabRef>test-aw2s-cleanup</htmlTabRef>
-  <htmlTabName>CleanUp of test servers</htmlTabName>
-  <htmlTabIcon>trash</htmlTabIcon>
-  <TestCaseRequestedList>
-    111111
-    222222
-    333333
-    444444
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id="111111">
-    <class>Undeploy_Object</class>
-    <desc>Undeploy gNB</desc>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_gnb</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-  </testCase>
-
-  <testCase id="222222">
-    <class>Undeploy_Object</class>
-    <desc>Undeploy nr UE</desc>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_nrue</yaml_path>
-    <eNB_instance>1</eNB_instance>
-    <eNB_serverId>1</eNB_serverId>
-  </testCase>
-
-  <testCase id="333333">
-    <class>Clean_Test_Server_Images</class>
-    <desc>Clean Test Images on Test Server</desc>
-    <test_svr_id>0</test_svr_id>
-  </testCase>
-
-  <testCase id="444444">
-    <class>Clean_Test_Server_Images</class>
-    <desc>Clean Test Images on Test Server</desc>
-    <test_svr_id>1</test_svr_id>
-  </testCase>
-
-</testCaseList>
-
diff --git a/ci-scripts/xml_files/container_sa_sc_b200_terminate.xml b/ci-scripts/xml_files/container_sa_sc_b200_terminate.xml
deleted file mode 100644
index 9db4c663f0..0000000000
--- a/ci-scripts/xml_files/container_sa_sc_b200_terminate.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-  <htmlTabRef>TEST-SA-FR1-B200-terminate</htmlTabRef>
-  <htmlTabName>Tear-down</htmlTabName>
-  <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
-  010001
-  010002
-  030201
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id= "010001">
-    <class>Detach_UE</class>
-    <desc>Detach UE</desc>
-    <id>idefix</id>
-  </testCase>
-  <testCase id="010002">
-    <class>Terminate_UE</class>
-    <desc>Terminate Quectel</desc>
-    <id>idefix</id>
-  </testCase>
-
-  <testCase id="030201">
-    <class>Undeploy_Object</class>
-    <desc>Undeploy gNB</desc>
-    <yaml_path>ci-scripts/yaml_files/sa_sc_b200_gnb</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-  </testCase>
-
-</testCaseList>