Aggressive cleanup