TODO general cleanup.

[alexmsmartins]

TODOs should be converted to issues (or solved) before removed from the code.
There might be a good reason to keep a TODO or FIXME in the code but lets avoid it if possible. Even if that happens, an issue must be raised as well.