Tidy up more Cleaner.clean() is called.