Add more cleaning