minor cleanup

* removed resolved/wrong TODOs
* removed dead code