Removed TODOs in comments where they were unnecessary