diff --git a/lib/util-iso-chroot.sh b/lib/util-iso-chroot.sh
index 99e8cf2..81dc177 100644
--- a/lib/util-iso-chroot.sh
+++ b/lib/util-iso-chroot.sh
@@ -261,20 +261,19 @@ chroot_create(){
 }
 
 chroot_clean(){
-    msg "Cleaning up ..."
-    for image in "$1"/*fs; do
-        [[ -d ${image} ]] || continue
-        local name=${image##*/}
+    msg "Cleaning chroot for [%s] (%s)..." "${target_branch}" "${target_arch}"
+    for root in "$1"/*fs; do
+        [[ -d ${root} ]] || continue
+        local name=${root##*/}
         if [[ $name != "mhwdfs" ]];then
-            msg2 "Deleting chroot [%s] (%s) ..." "$name" "${1##*/}"
-            lock 9 "${image}.lock" "Locking chroot '${image}'"
-            if [[ "$(stat -f -c %T "${image}")" == btrfs ]]; then
-                { type -P btrfs && btrfs subvolume delete "${image}"; } #&> /dev/null
-            fi
-        rm -rf --one-file-system "${image}"
+            stat_busy "Deleting chroot [%s] (%s) ..." "$name" "${1##*/}"
+            lock 9 "%s.lock" "Locking chroot '%s'" "${root}" "${root}"
+            subvolume_delete_recursive  "${root}"
+            rm -rf --one-file-system "${root}"
+            rm -f "${root}.lock"
         fi
     done
-    exec 9>&-
+    lock_close 9
     rm -rf --one-file-system "$1"
 }
 
diff --git a/lib/util-pkg-chroot.sh b/lib/util-pkg-chroot.sh
index 6779e2b..3ea76c3 100644
--- a/lib/util-pkg-chroot.sh
+++ b/lib/util-pkg-chroot.sh
@@ -117,18 +117,15 @@ chroot_create(){
 
 chroot_clean(){
     msg "Cleaning chroot for [%s] (%s)..." "${target_branch}" "${target_arch}"
-    for copy in "${work_dir}"/*; do
-        [[ -d ${copy} ]] || continue
-        msg2 "Deleting chroot copy %s ..." "$(basename "${copy}")"
-
-        lock 9 "${copy}.lock" "Locking chroot copy '${copy}'"
-
-        subvolume_delete_recursive "${copy}"
-        rm -rf --one-file-system "${copy}"
+    for root in "$1"/*; do
+        [[ -d ${root} ]] || continue
+        stat_busy "Deleting chroot copy %s ..." "${copy##*/}"
+        lock 9 "%s.lock" "Locking chroot copy '%s'" "${root}" "${root}"
+        subvolume_delete_recursive "${root}"
+        rm -rf --one-file-system "${root}"
     done
-    exec 9>&-
-
-    rm -rf --one-file-system "${work_dir}"
+    lock_close 9
+    rm -rf --one-file-system "$1"
 }
 
 chroot_update(){
@@ -136,7 +133,6 @@ chroot_update(){
     chroot-run ${mkchroot_args[*]} \
             "${work_dir}/${OWNER}" \
             pacman -Syu --noconfirm || abort
-
 }
 
 clean_up(){
@@ -200,7 +196,7 @@ post_build(){
 chroot_init(){
     local timer=$(get_timer)
     if ${clean_first} || [[ ! -d "${work_dir}" ]]; then
-        chroot_clean
+        chroot_clean "${work_dir}"
         chroot_create
     else
         chroot_update