Further codebase cleaning...