fixup! Simplifying the bundle