Remove completed TODO comment.
Add TODO comments.