Remove bundle, improve messaging defaults