And some more cleaning