Just a bit more cleaning...