Cleaned up bundles