diff --git a/execution/run_uc1.sh b/execution/run_uc1.sh
index 7dc0e4e97a801b1a974110c81bb37daef44d3f0b..e6a3eb05ed7cca167ccbc9ae8c3d5cbc9803e000 100755
--- a/execution/run_uc1.sh
+++ b/execution/run_uc1.sh
@@ -90,25 +90,10 @@ echo "Finish topic deletion, print topics:"
 echo "Delete ZooKeeper configurations used for workload generation"
 kubectl exec zookeeper-client -- bash -c "zookeeper-shell my-confluent-cp-zookeeper:2181 deleteall /workload-generation"
 echo "Waiting for deletion"
-
-while [ true ]
+while kubectl exec zookeeper-client -- bash -c "zookeeper-shell my-confluent-cp-zookeeper:2181 get /workload-generation"
 do
-    IFS=', ' read -r -a array <<< $(kubectl exec zookeeper-client -- bash -c "zookeeper-shell my-confluent-cp-zookeeper:2181 ls /" | tail -n 1 | awk -F[\]\[] '{print $2}')
-    found=0
-    for element in "${array[@]}"
-    do
-        if [ "$element" == "workload-generation" ]; then
-                found=1
-                break
-        fi
-    done
-    if [ $found -ne 1 ]; then
-        echo "ZooKeeper reset was successful."
-        break
-    else 
-        echo "ZooKeeper reset was not successful. Retrying in 5s."
-        sleep 5s
-    fi
+    echo "Wait for ZooKeeper state deletion."
+    sleep 5s
 done
 echo "Deletion finished"
 
diff --git a/execution/run_uc2.sh b/execution/run_uc2.sh
index c294e735bf5d991af51fb914fa9211bb6bdc9a2e..76d76cd4dc45b3b5e26ea4033c7afd58268fd3fb 100755
--- a/execution/run_uc2.sh
+++ b/execution/run_uc2.sh
@@ -89,25 +89,10 @@ echo "Finish topic deletion, print topics:"
 echo "Delete ZooKeeper configurations used for workload generation"
 kubectl exec zookeeper-client -- bash -c "zookeeper-shell my-confluent-cp-zookeeper:2181 deleteall /workload-generation"
 echo "Waiting for deletion"
-
-while [ true ]
+while kubectl exec zookeeper-client -- bash -c "zookeeper-shell my-confluent-cp-zookeeper:2181 get /workload-generation"
 do
-    IFS=', ' read -r -a array <<< $(kubectl exec zookeeper-client -- bash -c "zookeeper-shell my-confluent-cp-zookeeper:2181 ls /" | tail -n 1 | awk -F[\]\[] '{print $2}')
-    found=0
-    for element in "${array[@]}"
-    do
-        if [ "$element" == "workload-generation" ]; then
-                found=1
-                break
-        fi
-    done
-    if [ $found -ne 1 ]; then
-        echo "ZooKeeper reset was successful."
-        break
-    else
-        echo "ZooKeeper reset was not successful. Retrying in 5s."
-        sleep 5s
-    fi
+    echo "Wait for ZooKeeper state deletion."
+    sleep 5s
 done
 echo "Deletion finished"
 
diff --git a/execution/run_uc3.sh b/execution/run_uc3.sh
index 9537182280379a80877420b0864baaa77d382fea..1e34aea99fdc7a927e1943a397f02e1bb56f6a74 100755
--- a/execution/run_uc3.sh
+++ b/execution/run_uc3.sh
@@ -91,25 +91,10 @@ echo "Finish topic deletion, print topics:"
 echo "Delete ZooKeeper configurations used for workload generation"
 kubectl exec zookeeper-client -- bash -c "zookeeper-shell my-confluent-cp-zookeeper:2181 deleteall /workload-generation"
 echo "Waiting for deletion"
-
-while [ true ]
+while kubectl exec zookeeper-client -- bash -c "zookeeper-shell my-confluent-cp-zookeeper:2181 get /workload-generation"
 do
-    IFS=', ' read -r -a array <<< $(kubectl exec zookeeper-client -- bash -c "zookeeper-shell my-confluent-cp-zookeeper:2181 ls /" | tail -n 1 | awk -F[\]\[] '{print $2}')
-    found=0
-    for element in "${array[@]}"
-    do
-        if [ "$element" == "workload-generation" ]; then
-                found=1
-                break
-        fi
-    done
-    if [ $found -ne 1 ]; then
-        echo "ZooKeeper reset was successful."
-        break
-    else 
-        echo "ZooKeeper reset was not successful. Retrying in 5s."
-        sleep 5s
-    fi
+    echo "Wait for ZooKeeper state deletion."
+    sleep 5s
 done
 echo "Deletion finished"
 
diff --git a/execution/run_uc4.sh b/execution/run_uc4.sh
index 91366a49d252edbe872cda1e1726054ec5df4b61..bfd3ed8e2b970b12c5835ba5bcd8ea2dace0d84b 100755
--- a/execution/run_uc4.sh
+++ b/execution/run_uc4.sh
@@ -90,25 +90,10 @@ echo "Finish topic deletion, print topics:"
 echo "Delete ZooKeeper configurations used for workload generation"
 kubectl exec zookeeper-client -- bash -c "zookeeper-shell my-confluent-cp-zookeeper:2181 deleteall /workload-generation"
 echo "Waiting for deletion"
-
-while [ true ]
+while kubectl exec zookeeper-client -- bash -c "zookeeper-shell my-confluent-cp-zookeeper:2181 get /workload-generation"
 do
-    IFS=', ' read -r -a array <<< $(kubectl exec zookeeper-client -- bash -c "zookeeper-shell my-confluent-cp-zookeeper:2181 ls /" | tail -n 1 | awk -F[\]\[] '{print $2}')
-    found=0
-    for element in "${array[@]}"
-    do
-        if [ "$element" == "workload-generation" ]; then
-                found=1
-                break
-        fi
-    done
-    if [ $found -ne 1 ]; then
-        echo "ZooKeeper reset was successful."
-        break
-    else 
-        echo "ZooKeeper reset was not successful. Retrying in 5s."
-        sleep 5s
-    fi
+    echo "Wait for ZooKeeper state deletion."
+    sleep 5s
 done
 echo "Deletion finished"