Bundles clean-up