#198 pulled out outdated TODOs
Merge pull request #210 from klindenbach/198-TODOs

#198 pulled out outdated TODOs