Removed finished TODOs.
Removed unnecessary TODOs.