Removed broken Bundles, added puppet