Cleaning up more thoroughly before each run