Removed queue and donor::active
todo list update