Removed TODO for previous commit