Cleaner shutdown (hopefully)