chore: cleanup some todos, imports

[patlo-iog]

Description:

Cleanup todos and imports for merged and refactoring work.

Alternatives Considered (optional):

Link to existing ADR (Architecture Decision Record), if any. If relevant, describe other approaches explored and the selected approach. Documenting why the methods were not selected will create a knowledge base for future reference, helping prevent others from revisiting less optimal ideas.

Checklist:

• [ ] My PR follows the contribution guidelines of this project
• [ ] My PR is free of third-party dependencies that don't comply with the Allowlist
• [ ] I have commented my code, particularly in hard-to-understand areas
• [ ] I have made corresponding changes to the documentation
• [ ] I have added tests that prove my fix is effective or that my feature works
• [ ] I have checked the PR title to follow the conventional commit specification

[github-actions[bot]]

Integration Test Results

15 files  ±0  15 suites  ±0   2s :stopwatch: ±0s 33 tests ±0  33 :white_check_mark: ±0  0 :zzz: ±0  0 :x: ±0  46 runs  ±0  46 :white_check_mark: ±0  0 :zzz: ±0  0 :x: ±0 

Results for commit 6c373c76. ± Comparison against base commit 5398a75c.

[github-actions[bot]]

Unit Test Results

 96 files  ±0   96 suites  ±0   22m 37s :stopwatch: -14s 826 tests ±0  818 :white_check_mark: ±0  8 :zzz: ±0  0 :x: ±0  833 runs  ±0  825 :white_check_mark: ±0  8 :zzz: ±0  0 :x: ±0 

Results for commit 6c373c76. ± Comparison against base commit 5398a75c.