Revert "small tidy"

This reverts commit 9584d8814b4a19962ffd94555567b3220b5abf28.
Revert "Queue update (with memory leaks, but without fatals)"

This reverts commit 1a14b2b62b453f761f9be9d687d2e7b9e5671d3c.
Revert "Queue add"

This reverts commit 0d86ada109a9eee48367c2885b69468c7f3592ff.