diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java
index 0c0841443..78dec7d12 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java
@@ -267,6 +267,7 @@ void setupUIInfo(EntityDescriptor ed, EntityDescriptorRepresentation representat
     void setupContacts(EntityDescriptor ed, EntityDescriptorRepresentation representation) {
         // set up contacts
         if (representation.getContacts() != null && representation.getContacts().size() > 0) {
+            ed.getContactPersons().clear();
             for (ContactRepresentation contactRepresentation : representation.getContacts()) {
                 ContactPerson contactPerson = ((ContactPersonBuilder) openSamlObjects.getBuilderFactory().getBuilder(ContactPerson.DEFAULT_ELEMENT_NAME)).buildObject();
 
@@ -325,7 +326,7 @@ void setupSPSSODescriptor(EntityDescriptor ed, EntityDescriptorRepresentation re
                 );
             }
 
-
+            spssoDescriptor.getNameIDFormats().clear();
             if (representation.getServiceProviderSsoDescriptor() != null && representation.getServiceProviderSsoDescriptor().getNameIdFormats() != null && representation.getServiceProviderSsoDescriptor().getNameIdFormats().size() > 0) {
                 for (String nameidFormat : representation.getServiceProviderSsoDescriptor().getNameIdFormats()) {
                     NameIDFormat nameIDFormat = openSamlObjects.buildDefaultInstanceOfType(NameIDFormat.class);
diff --git a/ui/src/app/schema-form/widget/array/array.component.html b/ui/src/app/schema-form/widget/array/array.component.html
index 93fd94525..253fa2af4 100644
--- a/ui/src/app/schema-form/widget/array/array.component.html
+++ b/ui/src/app/schema-form/widget/array/array.component.html
@@ -22,7 +22,7 @@
     <ul class="mt-2"
         [ngClass]="{'bg-light border rounded p-3 list-group': getListType(formProperty) === 'object'}"
         [class.no-style]="getListType(formProperty) !== 'object'">
-        <li *ngFor="let itemProperty of formProperty.properties; let i=index; trackBy:trackByIndex"
+        <li *ngFor="let itemProperty of formProperty.properties; let i=index;"
             [class.mt-2]="i > 0"
             [class.list-group-item]="itemProperty.type === 'object'">
             <div [ngClass]="{ 'd-flex justify-content-between': itemProperty.type !== 'object' }">
@@ -30,7 +30,7 @@
                     <ng-container *ngSwitchDefault>
                         <sf-form-element class="flex-grow-1" [formProperty]="itemProperty"></sf-form-element>
                         <div class="py-2">
-                            <button class="btn btn-link pt-1" (click)="removeItem(i)" role="button">
+                            <button class="btn btn-link pt-1" (click)="removeItem(i, itemProperty); $event.stopPropagation()" role="button">
                                 <i class="fa fa-fw fa-trash fa-lg text-danger"></i>
                                 <span class="sr-only" translate="action.remove">Remove</span>
                             </button>
@@ -48,7 +48,7 @@
                                         <small class="sr-only" *ngIf="itemProperty.value.makeDefault === true" translate="label.default">(default)</small>
                                     </ng-container>
                                 </span>
-                                <button class="btn btn-link pt-1" (click)="removeItem(i)" role="button">
+                                <button class="btn btn-link pt-1" (click)="removeItem(i, itemProperty); $event.stopPropagation()" role="button">
                                     <i class="fa fa-fw fa-trash fa-lg text-danger"></i>
                                     <span class="sr-only" translate="action.remove">Remove</span>
                                 </button>
diff --git a/ui/src/app/schema-form/widget/array/array.component.ts b/ui/src/app/schema-form/widget/array/array.component.ts
index d527bd0b2..698500fca 100644
--- a/ui/src/app/schema-form/widget/array/array.component.ts
+++ b/ui/src/app/schema-form/widget/array/array.component.ts
@@ -3,6 +3,7 @@ import { Component, AfterViewInit, OnDestroy } from '@angular/core';
 import { ArrayWidget } from 'ngx-schema-form';
 import { map } from 'rxjs/operators';
 import { Observable, Subscription } from 'rxjs';
+import { FormProperty } from 'ngx-schema-form/lib/model/formproperty';
 
 export interface FormError {
     code: string;
@@ -42,6 +43,11 @@ export class CustomArrayComponent extends ArrayWidget implements AfterViewInit,
         this.hasErrorSub.unsubscribe();
     }
 
+    removeItem(index: number, item: FormProperty = null): void {
+        this.formProperty.properties = (<FormProperty[]>this.formProperty.properties).filter(i => i !== item);
+        this.formProperty.updateValueAndValidity(false, true);
+    }
+
     addItem(): void {
         super.addItem();
     }