Merge pull request #2810 from iBotPeaches/feature/user-guide-cleanup

cleanup warnings