cleanup and commenting out bubbles for particles