Refactorisation:

cleanup all references to old bundles