Bundle removal changes