Iwillig/remove queue async

WIP