Cleanup: update and remove unused bundles