Bundles cleanup