Remove already outdated comment
Add to-do items