Data bundle cleanup