Review "TODO" code comments

[eddybrando]

Feature description

We currently have 13 "TODO" comments in our code.

We need to review them individually and take one of the following actions:

• Remove the TODO if it's no longer necessary
• Create an issue to work on it

Seach for "TODO"

Additional context

No response

[techtolentino]

(great idea @eddybrando - thank you!)