NOJIRA Remove obsolete TODO comments
Merge pull request #2093 from raydavis/raywip

NOJIRA Remove obsolete TODO comments