Remove a TODO after Brad explanation
merge