condensed the bundles a bit, removed some unused mappings