Removed TODOs