remove obsolete TODOs and dry out a little more