Removed TODOs that were not being used.