Added extra clean operations