removed TODOs that have been handled or superceded