remove TODOs
Merge pull request #649 from davidchambers/todo

remove TODOs