Removed TODOs that are now implemented.