more clean up from PRs.