Clean up, prepare for randomized restarts