Tidy up runtime