Updated cleaning