Removed a few TODOs