Remove bundle, switch to bsfy'ed chai