cleanups
fix for Queue when combining pushes and swap_removes