[Code Cleanup] Committed TODO notes
6.7-rc