Another TODO bites the dust