More cleanup before pull request.