misc. minor cleanup
more minor cleaning
Merge branch 'get-version-history'