Force extra clean on cleanup