diff --git a/.bin/Scripts/system_checklist.py b/.bin/Scripts/system_checklist.py
index a2c23529..314a13d2 100644
--- a/.bin/Scripts/system_checklist.py
+++ b/.bin/Scripts/system_checklist.py
@@ -63,6 +63,9 @@ if __name__ == '__main__':
             function=cleanup_emsisoft, cs='Done')
         try_and_print(message='Registry Backup(s)...',
             function=cleanup_regbackups, cs='Done')
+        try_and_print(message='{}...'.format(KIT_NAME_FULL),
+            function=delete_empty_folders, cs='Done',
+            folder_path=global_vars['ClientDir'])
 
         # Export system info
         if not D7_MODE:
diff --git a/.bin/Scripts/system_checklist_hw.py b/.bin/Scripts/system_checklist_hw.py
index de0b8ba3..15ea9012 100644
--- a/.bin/Scripts/system_checklist_hw.py
+++ b/.bin/Scripts/system_checklist_hw.py
@@ -61,6 +61,12 @@ if __name__ == '__main__':
         try_and_print(message='Registry...',
             function=backup_registry, cs='Done', other_results=other_results)
 
+        # Cleanup
+        print_info('Cleanup')
+        try_and_print(message='{}...'.format(KIT_NAME_FULL),
+            function=delete_empty_folders, cs='Done',
+            folder_path=global_vars['ClientDir'])
+
         # User data
         print_info('User Data')
         show_user_data_summary()