add better logging to folder cleanout, remove extra cleanouts