Removed the todo