removed unused mappings; some new bundles