Remove todo-comments as the related values are in use.