Some more cleaning