Update bundles, clean up config