Removed some todos since they were added to jira.