Review and remove a TODO