Sweeping cleaning and tweaks to get to base state.