Bundles update and fixes
Removed unused setting
Bundles update