more cleaning, warning NOT working