Clean up some out of date TODOs