Audit of @todo items

Problem/Motivation

There are several @todo items referencing closed issues. We should remove/update them as needed.

Steps to reproduce

Proposed resolution

Remaining tasks

User interface changes

API changes

Data model changes

Release notes snippet