diff --git a/install.sh b/install.sh
index cb43a42..632e182 100755
--- a/install.sh
+++ b/install.sh
@@ -140,6 +140,8 @@ su - $SUDO_USER -c "rm ~/pandora/pandora/workers/mwdb.*"
 su - $SUDO_USER -c "rm ~/pandora/pandora/workers/ole.*"
 su - $SUDO_USER -c "rm ~/pandora/pandora/workers/preview.*"
 su - $SUDO_USER -c "rm ~/pandora/pandora/workers/virustotal.*"
+su - $SUDO_USER -c "rm ~/pandora/pandora/workers/xml*"
+su - $SUDO_USER -c "rm ~/pandora/pandora/workers/hashlookup*"
 
 # Remove files from quarantine after 180 days
 { crontab -l -u $SUDO_USER; echo '0 * * * * find /var/quarantine/* -type f -mtime +180 -delete '; } | crontab -u $SUDO_USER -
diff --git a/pandora-box.py b/pandora-box.py
index 02ccc40..6bcd108 100755
--- a/pandora-box.py
+++ b/pandora-box.py
@@ -751,6 +751,10 @@ def clean():
 
         umount_device()
 
+        logging.info(
+            f'hostname="{hostname}", '
+            f'cleaned="{files_removed}/{len(infected_files)}"')
+
         if not has_error:
             if has_curses:
                 log('Device cleaned !', flush=True)
@@ -760,11 +764,7 @@ def clean():
             if has_curses:
                 log('Device not cleaned !', flush=True)
             else:
-                display_image("ERROR")
-                wait_mouse_click()
-        logging.info(
-            f'hostname="{hostname}", '
-            f'cleaned="{files_removed}/{len(infected_files)}"')
+                display_image("WAIT")
     else:
         if not has_curses:
             display_image("OK")