pull request and file cleanups