Remove old comment.
Add todo note.