diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/frontend/RelyingPartyOverridesRepresentation.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/frontend/RelyingPartyOverridesRepresentation.java
deleted file mode 100644
index cac2a1d6a..000000000
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/frontend/RelyingPartyOverridesRepresentation.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package edu.internet2.tier.shibboleth.admin.ui.domain.frontend;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-public class RelyingPartyOverridesRepresentation implements Serializable {
-
-    private static final long serialVersionUID = 2439457246884861580L;
-
-    private boolean signAssertion;
-
-    private boolean dontSignResponse;
-
-    private boolean turnOffEncryption;
-
-    private boolean useSha;
-
-    private boolean ignoreAuthenticationMethod;
-
-    private boolean omitNotBefore;
-
-    private String responderId;
-
-    private List<String> nameIdFormats = new ArrayList<>();
-
-    private List<String> authenticationMethods = new ArrayList<>();
-
-    private boolean forceAuthn;
-
-    public boolean isSignAssertion() {
-        return signAssertion;
-    }
-
-    public void setSignAssertion(boolean signAssertion) {
-        this.signAssertion = signAssertion;
-    }
-
-    public boolean isDontSignResponse() {
-        return dontSignResponse;
-    }
-
-    public void setDontSignResponse(boolean dontSignResponse) {
-        this.dontSignResponse = dontSignResponse;
-    }
-
-    public boolean isTurnOffEncryption() {
-        return turnOffEncryption;
-    }
-
-    public void setTurnOffEncryption(boolean turnOffEncryption) {
-        this.turnOffEncryption = turnOffEncryption;
-    }
-
-    public boolean isUseSha() {
-        return useSha;
-    }
-
-    public void setUseSha(boolean useSha) {
-        this.useSha = useSha;
-    }
-
-    public boolean isIgnoreAuthenticationMethod() {
-        return ignoreAuthenticationMethod;
-    }
-
-    public void setIgnoreAuthenticationMethod(boolean ignoreAuthenticationMethod) {
-        this.ignoreAuthenticationMethod = ignoreAuthenticationMethod;
-    }
-
-    public boolean isOmitNotBefore() {
-        return omitNotBefore;
-    }
-
-    public void setOmitNotBefore(boolean omitNotBefore) {
-        this.omitNotBefore = omitNotBefore;
-    }
-
-    public String getResponderId() {
-        return responderId;
-    }
-
-    public void setResponderId(String responderId) {
-        this.responderId = responderId;
-    }
-
-    public List<String> getNameIdFormats() {
-        return nameIdFormats;
-    }
-
-    public void setNameIdFormats(List<String> nameIdFormats) {
-        this.nameIdFormats = nameIdFormats;
-    }
-
-    public List<String> getAuthenticationMethods() {
-        return authenticationMethods;
-    }
-
-    public void setAuthenticationMethods(List<String> authenticationMethods) {
-        this.authenticationMethods = authenticationMethods;
-    }
-
-    public boolean isForceAuthn() {
-        return forceAuthn;
-    }
-
-    public void setForceAuthn(boolean forceAuthn) {
-        this.forceAuthn = forceAuthn;
-    }
-}
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorService.java
index a78651964..ea57c4d06 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorService.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorService.java
@@ -2,7 +2,6 @@
 
 import edu.internet2.tier.shibboleth.admin.ui.domain.Attribute;
 import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityDescriptorRepresentation;
-import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.RelyingPartyOverridesRepresentation;
 import org.opensaml.saml.saml2.metadata.EntityDescriptor;
 
 import java.util.List;
@@ -48,10 +47,10 @@ public interface EntityDescriptorService {
     List<String> getAttributeReleaseListFromAttributeList(List<Attribute> attributeList);
 
     /**
-     * Given a list of attributes, generate a RelyingPartyOverridesRepresentation
+     * Given a list of attributes, generate a map of relying party overrides
      *
      * @param attributeList the list of attributes to generate from
-     * @return a RelyingPartyOverridesRepresentation based on the given list of attributes
+     * @return a map of String->Object (property name -> property value) based on the given list of attributes
      */
     Map<String, Object> getRelyingPartyOverridesRepresentationFromAttributeList(List<Attribute> attributeList);
 
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityService.java
index b85473e78..6a676844a 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityService.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityService.java
@@ -1,7 +1,6 @@
 package edu.internet2.tier.shibboleth.admin.ui.service;
 
 import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityDescriptorRepresentation;
-import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.RelyingPartyOverridesRepresentation;
 import org.opensaml.saml.saml2.core.Attribute;
 
 import java.util.List;
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/MetadataResolverRepositoryTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/MetadataResolverRepositoryTests.groovy
index 5d08d46e8..f26245e51 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/MetadataResolverRepositoryTests.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/MetadataResolverRepositoryTests.groovy
@@ -6,7 +6,6 @@ import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfigurat
 import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilter
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilterTarget
-import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.RelyingPartyOverridesRepresentation
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicHttpMetadataResolver
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.FileBackedHttpMetadataResolver
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.LocalDynamicMetadataResolver
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestHelpers.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestHelpers.groovy
index f1df98614..9311fde2d 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestHelpers.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestHelpers.groovy
@@ -1,9 +1,7 @@
 package edu.internet2.tier.shibboleth.admin.ui.util
 
-import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.RelyingPartyOverridesRepresentation
 import groovy.xml.XmlUtil
 import org.apache.commons.lang.StringUtils
-import org.codehaus.groovy.tools.xml.DomToGroovy
 import org.w3c.dom.Document
 import org.xmlunit.builder.DiffBuilder
 import org.xmlunit.builder.Input