Merge pull request #1902 from devoncarew/tools_cleanup

fixes found when running through the getting started process