Final clean up before pull request.