walk-through cleanup