Updated TODOs.
Removed TODOs from source.