Removed a few TODOs that have been fixed.