Remove bundle.
Fix setup.