cleanup + make user bubbles faster