Walkthrough cleanup