several intermediate changes
Added removePrimaryButton