we can. I will do this cleanup in a subsequent pull request.