Can't find a TODO on any of the definitions around it, killing comment