Queue fix
Remove useless use
Fix docblocks
Merge pull request #2851 from lucasmichot/fix/queue

Queue fix