Removed TODOs that now have JIRA stories.