Remove any uncertainties

Default values that could induce problems when not using the Bundle in the exact same conditions.