Tidy up and restart