Tidy up before next step with dispatch