Interesting pattern for bucket deletion.

Not merged yet, but looks like a good way to keep buckets under control
Trying to improve completion logic
Hacky queue cleanup