Fix most bugs with queue removal