Merge pull request #8068 from jfrazelle/cleanup-various-fix-me-refs

Cleanup various fix me refs