Remove some TODOs that have been finished.