Remove a few TODOs that aren't relevant anymore.