Move TODO items from isid to the common TODO.
2 files changed