Remove references to _queue