Removed TODOs based on discussions