A bit more cleaning.