remove obsolete TODOs and refactor

[apanicker-nflx]

Pull Request type

• [ ] Bugfix
• [ ] Feature
• [x] Refactoring (no functional changes, no api changes)
• [ ] Build related changes (Please run ./gradlew generateLock saveLock to refresh dependencies)
• [ ] WHOSUSING.md
• [ ] Other (please describe):

NOTE: Please remember to run ./gradlew spotlessApply to fix any format violations.

Changes in this PR

Describe the new behavior from this PR, and why it's needed Issue #

Alternatives considered

Describe alternative implementation you have considered