Remove wait queue.
Merge branch 'rm-wait-queue' into develop