Some more cleaning.