Did some more cleaning