Remove unused bundles. Add new bundles