Some more cleaning...