#9603: Removed TODOs