Some more cleaning work.