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 5137773b5..9bbf5ec2a 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
@@ -676,9 +676,6 @@ public EntityDescriptorRepresentation createRepresentationFromDescriptor(org.ope
                 }
             }
 
-            // TODO: fix this; there is a problem with the way that defaults are working and the processing from the front end
-            ModelRepresentationConversions.completeMe(relyingPartyOverrides);
-
             representation.setRelyingPartyOverrides(relyingPartyOverrides);
         }
 
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/util/ModelRepresentationConversions.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/util/ModelRepresentationConversions.java
index afdae5ce7..b1669d8a9 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/util/ModelRepresentationConversions.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/util/ModelRepresentationConversions.java
@@ -99,17 +99,6 @@ public static Map<String, Object> getRelyingPartyOverridesRepresentationFromAttr
         return relyingPartyOverrides;
     }
 
-    // TODO: fix this; currently there is a problem with not returning a value
-    public static Map<String,Object> completeMe(Map<String, Object> relyingPartyOverrides) {
-        customPropertiesConfiguration
-                .getOverrides()
-                .stream()
-                .filter(o -> !relyingPartyOverrides.containsKey(o.getName()))
-                .filter(o -> o.getDisplayType().equals("boolean"))
-                .forEach(p -> relyingPartyOverrides.put(p.getName(), getDefaultValueFromProperty(p)));
-        return relyingPartyOverrides;
-    }
-
     private static Object getDefaultValueFromProperty(RelyingPartyOverrideProperty property) {
         switch (property.getDisplayType()) {
             case "boolean":