Cleanup

Cleanups to avoid unnecessary changes in any pull requests.