simplified folder cleaning, ALMOST DONE