Walk-through clean-up