Improved clean task