Revert "add queues for stats and as a filter option"

This reverts commit a4d1933a084530d98f0952c052e8b9176d2f1782.