Removed a TODO item.
Merge branch 'todo'