#68: Make folder cleaning SO agnostic and checked after each step