cleanup, some new bundles