Removed ToDo comment