[0.16] Resolve or raise all TODO / FIXME / commented-out code

[kw217]

We should go through the code and identify all TODO / FIXME / commented-out code issues. Where possible we should resolve them, or at very least track them with GitHub issues.