Improve installation to speedup the bundle cleanup tasks.