Specify what is to be cleaned
Be less verbose at cleanup
Be more robust during cleanup