Removing a TODO

We’re going to solve this more elegantly than what the TODO suggests