Removed unused bundles, added a couple of convenience functions.