Removal of minor TODOs

Some were completed before and we forgot to remove the TODO, while
others I just took care of.
Merge pull request #1658 from david-christiansen/todo-removal

Removal of minor TODOs