Remove queue
Remove instances of queue usage