cleaning is now better supported