Remove TODOs (replaced with JIRA tickets)

Issue: SPR-10703