Cleaner shutdown and cosmetics