Cleared a few TODOs