remove some TODOs and commented-out test code
Merge pull request #2503 from waywardmonkeys/remove-commented-out-and-todos

remove some TODOs and commented-out test code