Fix aggressive cleanup.