Updated cleaning steps