more robust cleaning