always nice to eliminate a few TODO's and kill some bitrot.