remove build method from the bundle.
remove credit card workarounds, bugs fixed in master.