Remove obsolete TODO comments
Merge pull request #3160 from mbrubeck/old-layout-comments

Remove obsolete TODO comments