@@ -1,5 +1,18 @@
 @ECHO OFF
 IF EXIST .\cx-launcher.jar (
+  IF EXIST .\iast_cache (
+      rmdir /q /s .\iast_cache
+
+      IF EXIST .\logs (
+        rmdir /q /s .\logs
+      )
+
+      ECHO ""
+
+      ECHO Previous Checkmarx IAST results have been removed
+
+      ECHO ""
+  )
     CD ..\..
 
     CALL mvn clean package cargo:run -Pdeploywcxiast
 
@@ -2,9 +2,16 @@
 
 if [ -f ./cx-launcher.jar ]; then
 
-  if [ -d ./working ]; then
+  if [ -d ./iast_cache ]; then
+
+    rm -r ./iast_cache
+
+    if [ -d ./logs ]; then
+
+      rm -r ./logs
+
+    fi
 
-    rm -r ./working/cache
     echo ""
     echo "Previous Checkmarx IAST results in tools/CxIAST removed"
     echo ""