And another 12 TODO's bite the dust