diff --git a/test-compose/idp/Dockerfile b/test-compose/idp/Dockerfile
index dd9d1da..1cbb5db 100644
--- a/test-compose/idp/Dockerfile
+++ b/test-compose/idp/Dockerfile
@@ -1,4 +1,4 @@
-FROM tier/shib-idp:4.0.beta2_20200228
+FROM tier/shib-idp:4.0.beta_20200206
 
 # The build args below can be used at build-time to tell the build process where to find your config files.  This is for a completely burned-in config.
 ARG TOMCFG=config/tomcat
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/admin/general-admin.xml b/test-compose/idp/container_files/config/shib-idp/conf/admin/general-admin.xml
deleted file mode 100644
index 2814bf6..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/admin/general-admin.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
-    xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
-    default-init-method="initialize"
-    default-destroy-method="destroy">
-
-    <util:list id="shibboleth.AvailableAdminFlows">
-    
-        <!-- Status Page -->
-        <bean parent="shibboleth.AdminFlow"
-            c:id="http://shibboleth.net/ns/profiles/status"
-            p:loggingId="%{idp.service.logging.status:Status}"
-            p:policyName="%{idp.status.accessPolicy:AccessByIPAddress}" />
-
-        <!-- Service Reload -->
-        <bean parent="shibboleth.AdminFlow"
-            c:id="http://shibboleth.net/ns/profiles/reload-service-configuration"
-            p:loggingId="%{idp.service.logging.serviceReload:Reload}"
-            p:policyName="%{idp.reload.accessPolicy:AccessByIPAddress}" />
-
-        <!-- MetadataResolver Reload -->
-        <bean parent="shibboleth.AdminFlow"
-            c:id="http://shibboleth.net/ns/profiles/reload-metadata"
-            p:loggingId="%{idp.service.logging.serviceReload:Reload}"
-            p:policyName="%{idp.reload.accessPolicy:AccessByIPAddress}" />
-
-        <!-- AttributeResolver Debugging -->
-        <bean parent="shibboleth.AdminFlow"
-            c:id="http://shibboleth.net/ns/profiles/resolvertest"
-            p:loggingId="%{idp.service.logging.resolvertest:ResolverTest}"
-            p:policyName="%{idp.resolvertest.accessPolicy:AccessByIPAddress}" />
-
-        <!-- Metadata Query -->
-        <bean parent="shibboleth.AdminFlow"
-            c:id="http://shibboleth.net/ns/profiles/mdquery"
-            p:loggingId="MetadataQuery"
-            p:policyName="AccessByIPAddress" />
-
-        <!-- REST AccountLockoutManager Access -->
-        <bean parent="shibboleth.AdminFlow"
-            c:id="http://shibboleth.net/ns/profiles/lockout-manager"
-            p:loggingId="Lockout"
-            p:policyName="AccessByIPAddress" />
-
-        <!-- REST StorageService Access -->
-        <bean parent="shibboleth.AdminFlow"
-            c:id="http://shibboleth.net/ns/profiles/storage"
-            p:loggingId="Storage"
-            p:policyName="AccessByIPAddress" />
-    
-        <!-- REST Interface to Metrics -->
-        <bean parent="shibboleth.AdminFlow"
-            c:id="http://shibboleth.net/ns/profiles/metrics"
-            p:loggingId="Metrics"
-            p:policyNameLookupStrategy-ref="shibboleth.metrics.AccessPolicyStrategy" />
-
-        <!-- Attended Startup Unlock -->
-        <!--
-        <bean parent="shibboleth.OneTimeAdminFlow"
-            c:id="http://shibboleth.net/ns/profiles/unlock-keys"
-            p:loggingId="UnlockKeys"
-            p:authenticated="true"
-            p:policyName="AccessByAdminUser" />
-        -->
-    
-    </util:list>
-
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/admin/metrics.xml b/test-compose/idp/container_files/config/shib-idp/conf/admin/metrics.xml
deleted file mode 100644
index fccf419..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/admin/metrics.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
-    xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
-    default-init-method="initialize"
-    default-destroy-method="destroy">
-    
-    <!-- Metrics enablement / activation. -->
-
-    <!--
-    Register one or more of the built-in system metric sets available.
-    -->
-
-    <bean parent="shibboleth.metrics.RegisterMetricSets">
-        <property name="arguments">
-            <list>
-                <ref bean="shibboleth.metrics.CoreGaugeSet" />
-                <ref bean="shibboleth.metrics.IdPGaugeSet" />
-                <ref bean="shibboleth.metrics.LoggingGaugeSet" />
-                <ref bean="shibboleth.metrics.AccessControlGaugeSet" />
-                <ref bean="shibboleth.metrics.MetadataGaugeSet" />
-                <ref bean="shibboleth.metrics.NameIdentifierGaugeSet" />
-                <ref bean="shibboleth.metrics.RelyingPartyGaugeSet" />
-                <ref bean="shibboleth.metrics.AttributeResolverGaugeSet" />
-                <ref bean="shibboleth.metrics.AttributeFilterGaugeSet" />
-                <ref bean="shibboleth.metrics.CASServiceRegistryGaugeSet" />
-                <ref bean="shibboleth.metrics.ManagedBeanGaugeSet" />
-
-                <!--
-                <bean class="com.codahale.metrics.jvm.CachedThreadStatesGaugeSet"
-                    c:_0="1" c:_1="#{T(java.util.concurrent.TimeUnit).MINUTES}" />
-                <bean class="com.codahale.metrics.jvm.ClassLoadingGaugeSet" />
-                <bean class="com.codahale.metrics.jvm.GarbageCollectorMetricSet" />
-                <bean class="com.codahale.metrics.jvm.MemoryUsageGaugeSet" />
-                -->
-            </list>
-        </property>
-    </bean>
-
-    <!-- Metrics REST API Configuration -->
-
-    <!--
-    The global metric set is available by default at /idp/profile/admin/metrics
-    
-    Any pathinfo after that is assumed to identify specific named metrics. You can
-    create mappings here between a logical "group" name and an implementation of the
-    com.codahale.metrics.MetricFilter interface to specify which metrics to include.
-    -->
-    <util:map id="shibboleth.metrics.MetricGroups">
-        <entry key="core" value-ref="shibboleth.metrics.CoreGaugeSet" />
-        <entry key="idp" value-ref="shibboleth.metrics.IdPGaugeSet" />
-        <entry key="logging" value-ref="shibboleth.metrics.LoggingGaugeSet" />
-        <entry key="access" value-ref="shibboleth.metrics.AccessControlGaugeSet" />
-        <entry key="metadata" value-ref="shibboleth.metrics.MetadataGaugeSet" />
-        <entry key="nameid" value-ref="shibboleth.metrics.NameIdentifierGaugeSet" />
-        <entry key="relyingparty" value-ref="shibboleth.metrics.RelyingPartyGaugeSet" />
-        <entry key="resolver" value-ref="shibboleth.metrics.AttributeResolverGaugeSet" />
-        <entry key="filter" value-ref="shibboleth.metrics.AttributeFilterGaugeSet" />
-        <entry key="cas" value-ref="shibboleth.metrics.CASServiceRegistryGaugeSet" />
-        <entry key="bean" value-ref="shibboleth.metrics.ManagedBeanGaugeSet" />
-    </util:map>
-        
-    <!-- If you don't specify an alternate access policy, this named policy will be enforced. -->
-    <bean id="shibboleth.metrics.DefaultAccessPolicy" class="java.lang.String" c:_0="AccessByIPAddress" />
-    
-    <!--
-    To override the default access policy, map a metric name or
-    mapped group above to an alternative policy name.
-    -->
-    <util:map id="shibboleth.metrics.AccessPolicyMap">
-    
-    </util:map>
-        
-    <!--
-    In addition to the "pull" REST API for accessing metrics, a "push" reporter is also
-    available to upload a JSON feed to a URL. The example shown relies on standard JVM
-    trust configuration for TLS server verification.
-    
-    The "start" method triggers the timer thread; the example pushes every 30 minutes.
-    -->
-    <!--
-    <bean id="PushReporter" parent="shibboleth.metrics.HTTPReporter" c:name="MyCollector"
-        p:collectorURL="https://log.example.org/cgi-bin/collector.cgi" />
-                
-    <bean class="org.springframework.beans.factory.config.MethodInvokingBean"
-            p:targetObject-ref="PushReporter"
-            p:targetMethod="start">
-        <property name="arguments">
-            <list>
-                <value>30</value>
-                <util:constant static-field="java.util.concurrent.TimeUnit.MINUTES" />
-            </list>
-        </property>
-    </bean>
-    -->
-
-    <!-- IdP Metrics Configuration -->
-    
-    <!--
-    A bean named shibboleth.metrics.MetricStrategy of type Function<ProfileRequestContext,Boolean>
-    can be defined to add timers and counters to a large range of objects in the system. Each timer is
-    defined by a triple (timer name, start object, stop object). Counters are just object/counter pairs.
-    
-    The most common example is to start a timer when a particular flow action bean starts and
-    stop it when the same or different action bean stops, to measure how long the execution takes.
-    
-    If you want to leave a timer in place but disabled to prevent overhead, you can turn off a
-    logging category named "metrics.<timername>" in your logging configuration.
-    -->
-    <!--
-    <bean id="shibboleth.metrics.MetricStrategy" parent="shibboleth.ContextFunctions.Scripted"
-            factory-method="inlineScript">
-        <constructor-arg>
-            <value>
-            <![CDATA[
-                metricCtx = input.getSubcontext("org.opensaml.profile.context.MetricContext");
-                metricCtx.addTimer("idp.attribute.resolution",
-                    "ResolveAttributes",
-                    "FilterAttributes"
-                    );                                
-                true; // Signals success.
-            ]]>
-            </value>
-        </constructor-arg>
-    </bean>
-    -->
-    
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/attribute-registry.xml b/test-compose/idp/container_files/config/shib-idp/conf/attribute-registry.xml
deleted file mode 100644
index 8890f4b..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/attribute-registry.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <!--
-    The system comes preconfigured to load rules directly from resource files
-    configured in services.xml so they're monitored for changes.
-    
-    You can add mappings here, add more XML resource files,
-    or drop property files into the directory noted below.
-    -->
-
-    <!-- Default directory for custom mappings. -->
-    <bean parent="shibboleth.TranscodingRuleLoader" c:_0="%{idp.home}/conf/attributes/custom" />
-   
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver-full.xml b/test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver-full.xml
deleted file mode 100644
index ad75dbc..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver-full.xml
+++ /dev/null
@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    This file is an EXAMPLE configuration file containing lots of commented
-    example attributes, encoders, and a couple of example data connectors.
-     
-    Not all attribute definitions or data connectors are demonstrated, but
-    a variety of LDAP attributes, some common to Shibboleth deployments and
-    many not, are included.
-    
-    Deployers should refer to the Identity Provider 3 documentation
-    
-    https://wiki.shibboleth.net/confluence/display/IDP30/AttributeResolverConfiguration
-     
-    for a complete list of components and their options.
--->
-<AttributeResolver
-        xmlns="urn:mace:shibboleth:2.0:resolver"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
-
-    <!-- ========================================== -->
-    <!--      Attribute Definitions                 -->
-    <!-- ========================================== -->
-
-    <!-- Schema: Core schema attributes-->
-<!--
-
-    <AttributeDefinition xsi:type="Simple" id="uid">
-        <InputDataConnector ref="myLDAP" attributeNames="uid"/>
-    </AttributeDefinition>
-
-    <AttributeDefinition xsi:type="Simple" id="mail">
-        <InputDataConnector ref="myLDAP" attributeNames="mail"/>
-    </AttributeDefinition>
-
-    <AttributeDefinition xsi:type="Simple" id="homePhone">
-        <InputDataConnector ref="myLDAP" attributeNames="homePhone"/>
-    </AttributeDefinition>
-
-    <AttributeDefinition xsi:type="Simple" id="homePostalAddress">
-        <InputDataConnector ref="myLDAP" attributeNames="homePostalAddress"/>
-    </AttributeDefinition>
-
-    <AttributeDefinition xsi:type="Simple" id="mobileNumber">
-        <InputDataConnector ref="myLDAP" attributeNames="mobile"/>
-    </AttributeDefinition>
-
-    <AttributeDefinition xsi:type="Simple" id="pagerNumber">
-        <InputDataConnector ref="myLDAP" attributeNames="pager"/>
-    </AttributeDefinition>
-
-    <AttributeDefinition xsi:type="Simple" id="surname">
-        <InputDataConnector ref="myLDAP" attributeNames="sn"/>
-    </AttributeDefinition>
-
-    <AttributeDefinition xsi:type="Simple" id="locality">
-        <InputDataConnector ref="myLDAP" attributeNames="l"/>
-    </AttributeDefinition>
-
-    <AttributeDefinition xsi:type="Simple" id="stateProvince">
-        <InputDataConnector ref="myLDAP" attributeNames="st"/>
-    </AttributeDefinition>
-
-    <AttributeDefinition xsi:type="Simple" id="street">
-        <InputDataConnector ref="myLDAP" attributeNames="street"/>
-    </AttributeDefinition>
-
-    <AttributeDefinition xsi:type="Simple" id="organizationName">
-        <InputDataConnector ref="myLDAP" attributeNames="o"/>
-    </AttributeDefinition>
-
-    <AttributeDefinition xsi:type="Simple" id="organizationalUnit">
-        <InputDataConnector ref="myLDAP" attributeNames="ou"/>
-    </AttributeDefinition>
-
-    <AttributeDefinition xsi:type="Simple" id="title">
-        <InputDataConnector ref="myLDAP" attributeNames="title"/>
-    </AttributeDefinition>
-
-    <AttributeDefinition xsi:type="Simple" id="postalAddress">
-        <InputDataConnector ref="myLDAP" attributeNames="postalAddress"/>
-    </AttributeDefinition>
-
-    <AttributeDefinition xsi:type="Simple" id="postalCode">
-        <InputDataConnector ref="myLDAP" attributeNames="postalCode"/>
-    </AttributeDefinition>
-
-    <AttributeDefinition xsi:type="Simple" id="postOfficeBox">
-        <InputDataConnector ref="myLDAP" attributeNames="postOfficeBox"/>
-    </AttributeDefinition>
-
-    <AttributeDefinition xsi:type="Simple" id="telephoneNumber">
-        <InputDataConnector ref="myLDAP" attributeNames="telephoneNumber"/>
-    </AttributeDefinition>
-
-    <AttributeDefinition xsi:type="Simple" id="givenName">
-        <InputDataConnector ref="myLDAP" attributeNames="givenName"/>
-    </AttributeDefinition>
-
-    <AttributeDefinition xsi:type="Simple" id="initials">
-        <InputDataConnector ref="myLDAP" attributeNames="initials"/>
-    </AttributeDefinition>
--->
-
-    <!-- Schema: inetOrgPerson attributes-->
-<!--
-    <AttributeDefinition xsi:type="Simple" id="departmentNumber">
-        <InputDataConnector ref="myLDAP" attributeNames="departmentNumber"/>
-    </AttributeDefinition>
-    
-    <AttributeDefinition xsi:type="Simple" id="displayName">
-        <InputDataConnector ref="myLDAP" attributeNames="displayName"/>
-    </AttributeDefinition> 
-
-    <AttributeDefinition xsi:type="Simple" id="employeeNumber">
-        <InputDataConnector ref="myLDAP" attributeNames="employeeNumber"/>
-    </AttributeDefinition>
-
-    <AttributeDefinition xsi:type="Simple" id="employeeType">
-        <InputDataConnector ref="myLDAP" attributeNames="employeeType"/>
-    </AttributeDefinition>
-
-    <AttributeDefinition xsi:type="Simple" id="jpegPhoto">
-        <InputDataConnector ref="myLDAP" attributeNames="jpegPhoto"/>
-    </AttributeDefinition>
-
-    <AttributeDefinition xsi:type="Simple" id="preferredLanguage">
-        <InputDataConnector ref="myLDAP" attributeNames="preferredLanguage"/>
-    </AttributeDefinition>
--->
-    <!-- Schema: eduPerson attributes -->
-<!-- 
-    <AttributeDefinition xsi:type="Simple" id="eduPersonAffiliation">
-        <InputDataConnector ref="myLDAP" attributeNames="eduPersonAffiliation" />
-    </AttributeDefinition>
-
-    <AttributeDefinition xsi:type="Simple" id="eduPersonEntitlement">
-        <InputDataConnector ref="myLDAP" attributeNames="eduPersonEntitlement"/>
-    </AttributeDefinition>
-
-    <AttributeDefinition xsi:type="Simple" id="eduPersonNickname">
-        <InputDataConnector ref="myLDAP" attributeNames="eduPersonNickname"/>
-    </AttributeDefinition>
-
-    <AttributeDefinition xsi:type="Simple" id="eduPersonPrimaryAffiliation">
-        <InputDataConnector ref="myLDAP" attributeNames="eduPersonPrimaryAffiliation"/>
-    </AttributeDefinition>
-
-    <AttributeDefinition xsi:type="Prescoped" id="eduPersonPrincipalName">
-        <InputDataConnector ref="myLDAP" attributeNames="eduPersonPrincipalName"/>
-    </AttributeDefinition>
-
-    <AttributeDefinition xsi:type="Prescoped" id="eduPersonPrincipalNamePrior">
-        <InputDataConnector ref="myLDAP" attributeNames="eduPersonPrincipalNamePrior"/>
-    </AttributeDefinition>
-
-    <AttributeDefinition xsi:type="Scoped" id="eduPersonScopedAffiliation" scope="%{idp.scope}">
-        <InputDataConnector ref="myLDAP" attributeNames="eduPersonAffiliation"/>
-    </AttributeDefinition>
-    
-    <AttributeDefinition xsi:type="Simple" id="eduPersonAssurance">
-        <InputDataConnector ref="myLDAP" attributeNames="eduPersonAssurance"/>
-    </AttributeDefinition>
--->
-
-    <!-- Semi-deprecated eduPersonUniqueId, should be phased out in favor of SAML subject-id replacement below. -->
-<!-- 
-    <AttributeDefinition xsi:type="Scoped" id="eduPersonUniqueId" scope="%{idp.scope}">
-        <InputDataConnector ref="myLDAP" attributeNames="%{idp.persistentId.sourceAttribute}"/>
-    </AttributeDefinition>
--->
-
-    <!-- Schema: SAML Subject ID Attributes -->
-<!--
-    <AttributeDefinition xsi:type="Scoped" id="samlSubjectID" scope="%{idp.scope}">
-        <InputDataConnector ref="myLDAP" attributeNames="%{idp.persistentId.sourceAttribute}"/>
-    </AttributeDefinition>
-
-    <AttributeDefinition xsi:type="Scoped" id="samlPairwiseID" scope="%{idp.scope}">
-        <InputDataConnector ref="computed" attributeNames="computedId"/>
-    </AttributeDefinition>
--->
-
-    <!-- ========================================== -->
-    <!--      Data Connectors                       -->
-    <!-- ========================================== -->
-
-    <!-- Example Static Connector -->
-
-    <!-- Example Relational Database Connector.  
-         In practice a <SimpleManagedConnection> is enough to get you going but you should consider a
-         <BeanManagedConnection> fully configured for your particular environment -->
-    
-<!--
-    <DataConnector id="mySIS" xsi:type="RelationalDatabase">
-        <SimpleManagedConnection jdbcDriver="oracle.jdbc.driver.OracleDriver"
-                                 jdbcURL="jdbc:oracle:thin:@db.example.org:1521:SomeDB" 
-                                 jdbcUserName="myid" 
-                                 jdbcPassword="mypassword" />
-        <QueryTemplate>
-            <![CDATA[
-                SELECT * FROM student WHERE gzbtpid = '$resolutionContext.principal'
-            ]]>
-        </QueryTemplate>
-
-        <Column columnName="gzbtpid" attributeID="uid" />
-        <Column columnName="fqlft" attributeID="gpa" />
-    </DataConnector>
--->
-
-    <!-- Example LDAP Connector -->
-<!--
-    <DataConnector id="myLDAP" xsi:type="LDAPDirectory"
-        ldapURL="%{idp.attribute.resolver.LDAP.ldapURL}"
-        baseDN="%{idp.attribute.resolver.LDAP.baseDN}" 
-        principal="%{idp.attribute.resolver.LDAP.bindDN}"
-        principalCredential="%{idp.attribute.resolver.LDAP.bindDNCredential}"
-        useStartTLS="%{idp.attribute.resolver.LDAP.useStartTLS:true}"
-        connectTimeout="%{idp.attribute.resolver.LDAP.connectTimeout}"
-		trustFile="%{idp.attribute.resolver.LDAP.trustCertificates}"
-        responseTimeout="%{idp.attribute.resolver.LDAP.responseTimeout}">
-        <FilterTemplate>
-            <![CDATA[
-                %{idp.attribute.resolver.LDAP.searchFilter}
-            ]]>
-        </FilterTemplate>
-	    <ConnectionPool
-            minPoolSize="%{idp.pool.LDAP.minSize:3}"
-            maxPoolSize="%{idp.pool.LDAP.maxSize:10}"
-            blockWaitTime="%{idp.pool.LDAP.blockWaitTime:PT3S}"
-            validatePeriodically="%{idp.pool.LDAP.validatePeriodically:true}"
-            validateTimerPeriod="%{idp.pool.LDAP.validatePeriod:PT5M}"
-            expirationTime="%{idp.pool.LDAP.idleTime:PT10M}" />
-    </DataConnector>
--->
-
-    <!-- DataConector for pairwise-id (example depends on saml-nameid.properties). -->
-
-<!-- 
-    <DataConnector id="computed" xsi:type="ComputedId"
-	    generatedAttributeID="computedId"
-	    salt="%{idp.persistentId.salt}"
-	    algorithm="%{idp.persistentId.algorithm:SHA}"
-        encoding="%{idp.persistentId.encoding:BASE32}">
-	    
-        <InputDataConnector ref="myLDAP" attributeNames="%{idp.persistentId.sourceAttribute}" />
-        
-	</DataConnector>
--->
-
-</AttributeResolver>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver-ldap.xml b/test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver-ldap.xml
deleted file mode 100644
index 76e6d55..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver-ldap.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-    This file is an EXAMPLE configuration file. While the configuration
-    presented in this example file is semi-functional, it isn't very
-    interesting. It is here only as a starting point for your deployment
-    process.
-    
-    Very few attribute definitions and data connectors are demonstrated,
-    and use of LDAP is assumed, with the LDAP configuration primarily
-    supplied from the ldap.properties file.
-
-    Attribute-resolver-full.xml contains more examples of attributes,
-    encoders, and data connectors. Deployers should refer to the Shibboleth
-    documentation for a complete list of components and their options.
--->
-<AttributeResolver
-        xmlns="urn:mace:shibboleth:2.0:resolver"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-        xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
-
-    <!-- ========================================== -->
-    <!--      Attribute Definitions                 -->
-    <!-- ========================================== -->
-
-    <!--
-    The EPPN is the "standard" federated username in higher ed.
-    For guidelines on the implementation of this attribute, refer
-    to the Shibboleth and eduPerson documentation. Above all, do
-    not expose a value for this attribute without considering the
-    long term implications. 
-    -->
-    <AttributeDefinition id="eduPersonPrincipalName" xsi:type="Prescoped" >
-        <InputDataConnector ref="myLDAP" attributeNames="eduPersonPrincipalName"/>
-    </AttributeDefinition>
-
-    <!--
-    The uid is the closest thing to a "standard" LDAP attribute
-    representing a local username, but you should generally *never*
-    expose uid to federated services, as it is rarely globally unique.
-    -->
-    <AttributeDefinition id="uid" xsi:type="Simple" >
-        <InputDataConnector ref="myLDAP" attributeNames="uid"/>
-    </AttributeDefinition>
-
-    <!--
-    In the rest of the world, the email address is the standard identifier,
-    despite the problems with that practice. Consider making the EPPN value
-    the same as your official email addresses whenever possible.
-    -->
-    <AttributeDefinition id="mail" xsi:type="Simple" >
-        <InputDataConnector ref="myLDAP" attributeNames="mail"/>
-    </AttributeDefinition>
-        
-    <!-- ========================================== -->
-    <!--      Data Connectors                       -->
-    <!-- ========================================== -->
-    
-    <!--
-    Example LDAP Connector
-    
-    The connectivity details can be specified in ldap.properties to
-    share them with your authentication settings if desired.
-    -->
-    <DataConnector id="myLDAP" xsi:type="LDAPDirectory"
-        ldapURL="%{idp.attribute.resolver.LDAP.ldapURL}"
-        baseDN="%{idp.attribute.resolver.LDAP.baseDN}" 
-        principal="%{idp.attribute.resolver.LDAP.bindDN}"
-        principalCredential="%{idp.attribute.resolver.LDAP.bindDNCredential}"
-        useStartTLS="%{idp.attribute.resolver.LDAP.useStartTLS:true}"
-        connectTimeout="%{idp.attribute.resolver.LDAP.connectTimeout}"
-        trustFile="%{idp.attribute.resolver.LDAP.trustCertificates}"
-        responseTimeout="%{idp.attribute.resolver.LDAP.responseTimeout}">
-        <FilterTemplate>
-            <![CDATA[
-                %{idp.attribute.resolver.LDAP.searchFilter}
-            ]]>
-        </FilterTemplate>
-	    <ConnectionPool
-            minPoolSize="%{idp.pool.LDAP.minSize:3}"
-            maxPoolSize="%{idp.pool.LDAP.maxSize:10}"
-            blockWaitTime="%{idp.pool.LDAP.blockWaitTime:PT3S}"
-            validatePeriodically="%{idp.pool.LDAP.validatePeriodically:true}"
-            validateTimerPeriod="%{idp.pool.LDAP.validatePeriod:PT5M}"
-            expirationTime="%{idp.pool.LDAP.idleTime:PT10M}"/>
-    </DataConnector>
-
-</AttributeResolver>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver.xml.orig b/test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver.xml.orig
deleted file mode 100644
index 0ee236b..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver.xml.orig
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-    This file is an EXAMPLE configuration file. While the configuration
-    presented in this example file is semi-functional, it isn't very
-    interesting. It is here only as a starting point for your deployment
-    process.
-    
-    Very few attribute definitions and data connectors are demonstrated,
-    and the data is derived statically from the logged-in username and a
-    static example connector.
-
-    Attribute-resolver-full.xml contains more examples of attributes,
-    encoders, and data connectors. Deployers should refer to the Shibboleth
-    documentation for a complete list of components and their options.
--->
-<AttributeResolver
-        xmlns="urn:mace:shibboleth:2.0:resolver" 
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-        xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
-
-
-    <!-- ========================================== -->
-    <!--      Attribute Definitions                 -->
-    <!-- ========================================== -->
-
-    <!--
-    The EPPN is the "standard" federated username in higher ed.
-    For guidelines on the implementation of this attribute, refer
-    to the Shibboleth and eduPerson documentation. Above all, do
-    not expose a value for this attribute without considering the
-    long term implications. 
-    -->
-    <AttributeDefinition id="eduPersonPrincipalName" xsi:type="Scoped" scope="%{idp.scope}">
-        <InputAttributeDefinition ref="uid" />
-    </AttributeDefinition>
-
-    <!--
-    The uid is the closest thing to a "standard" LDAP attribute
-    representing a local username, but you should generally *never*
-    expose uid to federated services, as it is rarely globally unique.
-    -->
-    <AttributeDefinition id="uid" xsi:type="PrincipalName" />
-
-    <!--
-    In the rest of the world, the email address is the standard identifier,
-    despite the problems with that practice. Consider making the EPPN
-    value the same as your official email addresses whenever possible.
-    -->
-    <AttributeDefinition id="mail" xsi:type="Template">
-        <InputAttributeDefinition ref="uid" />
-        <Template>
-          <![CDATA[
-               ${uid}@example.org
-          ]]>
-        </Template>
-    </AttributeDefinition>
-
-    <!--
-    This is an example of an attribute sourced from a data connector.
-    -->
-    <AttributeDefinition id="eduPersonScopedAffiliation" xsi:type="Scoped" scope="%{idp.scope}">
-        <InputDataConnector ref="staticAttributes" attributeNames="affiliation" />
-    </AttributeDefinition>
-
-
-    <!-- ========================================== -->
-    <!--      Data Connectors                       -->
-    <!-- ========================================== -->
-
-    <DataConnector id="staticAttributes" xsi:type="Static">
-        <Attribute id="affiliation">
-            <Value>member</Value>
-        </Attribute>
-    </DataConnector>
-
-</AttributeResolver>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/attributes/custom/README.txt b/test-compose/idp/container_files/config/shib-idp/conf/attributes/custom/README.txt
deleted file mode 100644
index 98977b0..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/attributes/custom/README.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# You can create custom attribute mapping rules using
-# simple property files stored in this directory tree.
-# Spring property replacement is NOT supported.
-
-# As an example, a default SAML 2 rule for eduPersonPrincipalName would be:
-
-#id=eduPersonPrincipalName
-#transcoder=SAML2ScopedStringTranscoder
-#saml2.name=urn:oid:1.3.6.1.4.1.5923.1.1.1.6
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/attributes/default-rules.xml b/test-compose/idp/container_files/config/shib-idp/conf/attributes/default-rules.xml
deleted file mode 100644
index b6289fe..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/attributes/default-rules.xml
+++ /dev/null
@@ -1,803 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <!-- Default Attribute transcoding rules. -->
-    
-    <bean parent="shibboleth.TranscodingRuleLoader">
-    <constructor-arg>
-    <list>
-
-        <!-- Schema: Core schema attributes-->
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">uid</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:0.9.2342.19200300.100.1.1</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:uid</prop>
-                    <prop key="displayName.en">User ID</prop>
-                    <prop key="displayName.de">Benutzer-ID</prop>
-                    <prop key="displayName.fr">ID utilisateur</prop>
-                    <prop key="displayName.it">ID dell'utente</prop>
-                    <prop key="displayName.ja">ユーザID</prop>
-                    <prop key="displayName.pt">User ID</prop>
-                    <prop key="displayName.sv">Användaridentitet</prop>
-                    <prop key="description.en">A unique identifier for a person, mainly used for user identification within the user's home organization.</prop>
-                    <prop key="description.de">Eine eindeutige Nummer für eine Person, welche hauptsächlich zur Identifikation innerhalb der Organisation benutzt wird.</prop>
-                    <prop key="description.fr">Identifiant de connexion d'une personnes sur les systèmes informatiques.</prop>
-                    <prop key="description.it">Identificativo unico della persona, usato per l'identificazione dell'utente all'interno della organizzazione di appartenenza.</prop>
-                    <prop key="description.ja">所属機関内で一意の利用者識別子</prop>
-                    <prop key="description.pt">Identificador do utilizador</prop>
-                    <prop key="description.sv">Användaridentitet: Unik identifierar som används vid lokal inloggning i hemmaorganisationen.</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">mail</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:0.9.2342.19200300.100.1.3</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:mail</prop>
-                    <prop key="displayName.en">E-mail</prop>
-                    <prop key="displayName.de">E-Mail</prop>
-                    <prop key="displayName.fr">Email</prop>
-                    <prop key="displayName.it">E-mail</prop>
-                    <prop key="displayName.ja">メールアドレス</prop>
-                    <prop key="displayName.pt">E-mail</prop>
-                    <prop key="displayName.sv">E-postadress</prop>
-                    <prop key="description.en">E-Mail: Preferred address for e-mail to be sent to this person</prop>
-                    <prop key="description.de">E-Mail-Adresse</prop>
-                    <prop key="description.de-ch">E-Mail Adresse</prop>
-                    <prop key="description.fr">Adresse de courrier électronique</prop>
-                    <prop key="description.it">E-Mail: l'indirizzo e-mail preferito dall'utente</prop>
-                    <prop key="description.ja">メールアドレス</prop>
-                    <prop key="description.pt">E-Mail: Endereço de correio electronico</prop>
-                    <prop key="description.sv">E-postadress: E-postadress som används av personen.</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">homePhone</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:0.9.2342.19200300.100.1.20</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:homePhone</prop>
-                    <prop key="displayName.en">Private phone number</prop>
-                    <prop key="displayName.de">Telefon Privat</prop>
-                    <prop key="displayName.fr">Teléphone personnel</prop>
-                    <prop key="displayName.it">Numero di telefono privato</prop>
-                    <prop key="displayName.ja">自宅電話番号</prop>
-                    <prop key="displayName.pt">Número de telefone privado</prop>
-                    <prop key="displayName.sv">Telefonnummer (hem)</prop>
-                    <prop key="description.en">Private phone number</prop>
-                    <prop key="description.de">Private Telefonnummer</prop>
-                    <prop key="description.fr">Numéro de téléphone de domicile de la personne</prop>
-                    <prop key="description.it">Numero di telefono privato</prop>
-                    <prop key="description.ja">自宅の電話番号</prop>
-                    <prop key="description.pt">Número de telefone privado do utilizador</prop>
-                    <prop key="description.sv">Telefonnummer (hem): Telefonnummer till bostaden.</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">homePostalAddress</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:0.9.2342.19200300.100.1.39</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:homePostalAddress</prop>
-                    <prop key="displayName.en">Home postal address</prop>
-                    <prop key="displayName.de">Heimatadresse</prop>
-                    <prop key="displayName.de-ch">Heimadresse</prop>
-                    <prop key="displayName.fr">Adresse personnelle</prop>
-                    <prop key="displayName.it">Indirizzo personale</prop>
-                    <prop key="displayName.ja">自宅住所</prop>
-                    <prop key="displayName.pt">Morada Pessoal</prop>
-                    <prop key="displayName.sv">Postadress (hem)</prop>
-                    <prop key="description.en">Home postal address: Home address of the user</prop>
-                    <prop key="description.de">Heimatadresse</prop>
-                    <prop key="description.de-ch">Heimadresse</prop>
-                    <prop key="description.fr">Adresse postale de domicile de la personne</prop>
-                    <prop key="description.it">Indirizzo personale: indirizzo dove abita l'utente</prop>
-                    <prop key="description.ja">自宅の住所</prop>
-                    <prop key="description.pt">Morada Pessoal: Morada do utilizador</prop>
-                    <prop key="description.sv">Postadress (hem): Postadress till bostaden.</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">mobile</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:0.9.2342.19200300.100.1.41</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:mobile</prop>
-                    <prop key="displayName.en">Mobile phone number</prop>
-                    <prop key="displayName.de">Telefon Mobil</prop>
-                    <prop key="displayName.fr">Numéro de mobile</prop>
-                    <prop key="displayName.it">Numero di cellulare</prop>
-                    <prop key="displayName.ja">携帯電話番号</prop>
-                    <prop key="displayName.pt">Número de telemóvel</prop>
-                    <prop key="displayName.sv">Telefonnummer (mobil)</prop>
-                    <prop key="description.en">Mobile phone number</prop>
-                    <prop key="description.de">Mobile Telefonnummer</prop>
-                    <prop key="description.fr">Numéro de teléphone mobile</prop>
-                    <prop key="description.it">Numero di cellulare</prop>
-                    <prop key="description.ja">携帯電話の電話番号</prop>
-                    <prop key="description.pt">Número de telemóvel do utilizador</prop>
-                    <prop key="description.sv">Telefonnummer (mobil): Telefonnummer till mobiltelefon.</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">pager</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:0.9.2342.19200300.100.1.42</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:pager</prop>
-                    <prop key="displayName.en">Pager number</prop>
-                    <prop key="description.en">Pager number</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">surname</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:2.5.4.4</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:sn</prop>
-                    <prop key="displayName.en">Surname</prop>
-                    <prop key="displayName.de">Nachname</prop>
-                    <prop key="displayName.fr">Nom de famille</prop>
-                    <prop key="displayName.it">Cognome</prop>
-                    <prop key="displayName.ja">姓</prop>
-                    <prop key="displayName.pt">Nome de Família</prop>
-                    <prop key="displayName.sv">Efternamn</prop>
-                    <prop key="description.en">Surname or family name</prop>
-                    <prop key="description.de">Familienname</prop>
-                    <prop key="description.fr">Nom de famille de l'utilisateur.</prop>
-                    <prop key="description.it">Cognome dell'utilizzatore</prop>
-                    <prop key="description.ja">氏名(姓)の英語表記</prop>
-                    <prop key="description.pt">Nome de Família</prop>
-                    <prop key="description.sv">Efternamn: Efternamn för personen.</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">locality</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:2.5.4.7</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:l</prop>
-                    <prop key="displayName.en">Locality name</prop>
-                    <prop key="displayName.de">Ort</prop>
-                    <prop key="displayName.fr">Locality name</prop>
-                    <prop key="displayName.ja">場所(L)</prop>
-                    <prop key="description.en">Locality name</prop>
-                    <prop key="description.de">Ort</prop>
-                    <prop key="description.fr">Nom de la localité où réside l'objet</prop>
-                    <prop key="description.ja">場所の名前 日本の場合は市区町村名</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">stateProvince</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:2.5.4.8</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:st</prop>
-                    <prop key="displayName.en">State or province name</prop>
-                    <prop key="displayName.ja">都道府県もしくは州や省(ST)</prop>
-                    <prop key="description.en">State or province name</prop>
-                    <prop key="description.ja">州名や省名 国によって異なり日本の場合は都道府県名</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">street</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:2.5.4.9</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:street</prop>
-                    <prop key="displayName.en">Street</prop>
-                    <prop key="displayName.de">Straße</prop>
-                    <prop key="displayName.de-ch">Strasse</prop>
-                    <prop key="displayName.fr">Rue</prop>
-                    <prop key="displayName.ja">通り</prop>
-                    <prop key="description.en">Street address</prop>
-                    <prop key="description.de">Name der Straße</prop>
-                    <prop key="description.de-ch">Strassenadresse</prop>
-                    <prop key="description.fr">Nom de rue</prop>
-                    <prop key="description.ja">通りおよび番地</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">organizationName</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:2.5.4.10</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:o</prop>
-                    <prop key="displayName.en">Organization name</prop>
-                    <prop key="displayName.de">Organisationsname</prop>
-                    <prop key="displayName.fr">Nom de l'organisation</prop>
-                    <prop key="displayName.ja">所属機関名</prop>
-                    <prop key="description.en">Organization name</prop>
-                    <prop key="description.de">Name der Organisation</prop>
-                    <prop key="description.fr">Nom de l'organisation</prop>
-                    <prop key="description.ja">所属機関名称の英語表記</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">organizationalUnit</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:2.5.4.11</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:ou</prop>
-                    <prop key="displayName.en">Organizational unit</prop>
-                    <prop key="displayName.de">Organisationseinheit</prop>
-                    <prop key="displayName.fr">Unité organisationnelle</prop>
-                    <prop key="displayName.ja">機関内所属名</prop>
-                    <prop key="description.en">Organizational unit</prop>
-                    <prop key="description.de">Name der Organisationseinheit</prop>
-                    <prop key="description.fr">Nom de l'unité organisationnelle</prop>
-                    <prop key="description.ja">機関内所属名称の英語表記</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">title</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:2.5.4.12</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:title</prop>
-                    <prop key="displayName.en">Title</prop>
-                    <prop key="displayName.de">Titel</prop>
-                    <prop key="displayName.fr">Title</prop>
-                    <prop key="displayName.ja">肩書き</prop>
-                    <prop key="description.en">Title of a person</prop>
-                    <prop key="description.de">Titel der Person</prop>
-                    <prop key="description.fr">Titre de la personne</prop>
-                    <prop key="description.ja">利用者の肩書き</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">postalAddress</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:2.5.4.16</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:postalAddress</prop>
-                    <prop key="displayName.en">Business postal address</prop>
-                    <prop key="displayName.de">Geschäftsadresse</prop>
-                    <prop key="displayName.fr">Adresse professionnelle</prop>
-                    <prop key="displayName.it">Indirizzo professionale</prop>
-                    <prop key="displayName.ja">所属機関住所</prop>
-                    <prop key="displayName.pt">Morada</prop>
-                    <prop key="displayName.sv">Postadress (arbete):</prop>
-                    <prop key="description.en">Business postal address: Campus or office address</prop>
-                    <prop key="description.de">Geschäftliche Adresse</prop>
-                    <prop key="description.de-ch">Adresse am Arbeitsplatz</prop>
-                    <prop key="description.fr">Adresse de l'institut, de l'université</prop>
-                    <prop key="description.it">Indirizzo professionale: indirizzo dell'istituto o dell'ufficio</prop>
-                    <prop key="description.ja">所属機関の住所</prop>
-                    <prop key="description.pt">Morada da instituição</prop>
-                    <prop key="description.sv">Postadress (arbete): Postadressen för arbetsplatsen</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">postalCode</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:2.5.4.17</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:postalCode</prop>
-                    <prop key="displayName.en">Postal code</prop>
-                    <prop key="displayName.en-us">ZIP code</prop>
-                    <prop key="displayName.de">Postleitzahl</prop>
-                    <prop key="displayName.fr">Code postal</prop>
-                    <prop key="displayName.ja">郵便番号</prop>
-                    <prop key="description.en">Postal code</prop>
-                    <prop key="description.en-us">ZIP code</prop>
-                    <prop key="description.de">Postleitzahl</prop>
-                    <prop key="description.fr">Code postal</prop>
-                    <prop key="description.ja">郵便番号</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">postOfficeBox</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:mace:dir:attribute-def:postOfficeBox</prop>
-                    <prop key="saml1.name">urn:oid:2.5.4.18</prop>
-                    <prop key="displayName.en">Postal box</prop>
-                    <prop key="displayName.de">Postfach</prop>
-                    <prop key="displayName.fr">Boite postale</prop>
-                    <prop key="displayName.fr-ch">Case postale</prop>
-                    <prop key="displayName.ja">私書箱</prop>
-                    <prop key="description.en">Postal box identifier</prop>
-                    <prop key="description.de">Postfach</prop>
-                    <prop key="description.fr">Boite postale</prop>
-                    <prop key="description.fr-ch">Case postale</prop>
-                    <prop key="description.ja">私書箱</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">telephoneNumber</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:mace:dir:attribute-def:telephoneNumber</prop>
-                    <prop key="saml1.name">urn:oid:2.5.4.20</prop>
-                    <prop key="displayName.en">Business phone number</prop>
-                    <prop key="displayName.de">Telefon Geschäft</prop>
-                    <prop key="displayName.fr">Teléphone professionnel</prop>
-                    <prop key="displayName.it">Numero di telefono dell'ufficio</prop>
-                    <prop key="displayName.ja">勤務先電話番号</prop>
-                    <prop key="displayName.pt">Telefone</prop>
-                    <prop key="displayName.sv">Telefonummer (arbete)</prop>
-                    <prop key="description.en">Business phone number: Office or campus phone number</prop>
-                    <prop key="description.de">Telefonnummer am Arbeitsplatz</prop>
-                    <prop key="description.fr">Teléphone de l'institut, de l'université</prop>
-                    <prop key="description.it">Numero di telefono dell'ufficio</prop>
-                    <prop key="description.ja">所属機関での利用者の電話番号</prop>
-                    <prop key="description.pt">Número de telefone</prop>
-                    <prop key="description.sv">Telefonummer (arbete): Telefonnummer till arbetsplatsen</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">givenName</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:2.5.4.42</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:givenName</prop>
-                    <prop key="displayName.en">Given name</prop>
-                    <prop key="displayName.de">Vorname</prop>
-                    <prop key="displayName.fr">Prénom</prop>
-                    <prop key="displayName.it">Nome</prop>
-                    <prop key="displayName.ja">名</prop>
-                    <prop key="displayName.pt">Nome</prop>
-                    <prop key="displayName.sv">Förnamn</prop>
-                    <prop key="description.en">Given name of a person</prop>
-                    <prop key="description.de">Vorname</prop>
-                    <prop key="description.fr">Prénom de l'utilisateur</prop>
-                    <prop key="description.it">Nome</prop>
-                    <prop key="description.ja">氏名(名)の英語表記</prop>
-                    <prop key="description.pt">Nome</prop>
-                    <prop key="description.sv">Förnamn: Förnamn för personen.</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">initials</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:2.5.4.43</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:initials</prop>
-                    <prop key="displayName.en">Initials</prop>
-                    <prop key="displayName.de">Initialen</prop>
-                    <prop key="displayName.fr">Initiales</prop>
-                    <prop key="displayName.ja">イニシャル</prop>
-                    <prop key="description.en">Initials</prop>
-                    <prop key="description.de">Anfangsbuchstaben des Namens</prop>
-                    <prop key="description.de-ch">Die Anfangsbuchstaben</prop>
-                    <prop key="description.fr">L' initiales</prop>
-                    <prop key="description.ja">イニシャル</prop>
-                </props>
-            </property>
-        </bean>
-
-        <!-- Schema: inetOrgPerson attributes-->
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">departmentNumber</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:2.16.840.1.113730.3.1.2</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:departmentNumber</prop>
-                    <prop key="displayName.en">Department number</prop>
-                    <prop key="displayName.de">Abteilungsnummer</prop>
-                    <prop key="description.en">Department number</prop>
-                    <prop key="description.de">Nummer der Abteilung</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">displayName</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:2.16.840.1.113730.3.1.241</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:displayName</prop>
-                    <prop key="displayName.en">Display Name</prop>
-                    <prop key="displayName.de">Anzeigename</prop>
-                    <prop key="displayName.fr">Nom</prop>
-                    <prop key="displayName.it">Nome</prop>
-                    <prop key="displayName.ja">表示名</prop>
-                    <prop key="description.en">The name that should appear in white-pages-like applications for this person.</prop>
-                    <prop key="description.de">Anzeigename</prop>
-                    <prop key="description.fr">Nom complet d'affichage</prop>
-                    <prop key="description.it">Nome</prop>
-                    <prop key="description.ja">アプリケーションでの表示に用いられる英字氏名</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">employeeNumber</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:2.16.840.1.113730.3.1.3</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:employeeNumber</prop>
-                    <prop key="displayName.en">Employee number</prop>
-                    <prop key="displayName.de">Mitarbeiternummer</prop>
-                    <prop key="displayName.fr">Numéro d'employé</prop>
-                    <prop key="displayName.it">Numero dell'utente</prop>
-                    <prop key="displayName.ja">従業員番号</prop>
-                    <prop key="displayName.pt">Número de empregado</prop>
-                    <prop key="displayName.sv">Anställningsnummer</prop>
-                    <prop key="description.en">Identifies an employee within an organization</prop>
-                    <prop key="description.de">Identifiziert einen Mitarbeiter innerhalb der Organisation</prop>
-                    <prop key="description.fr">Identifie un employé au sein de l'organisation</prop>
-                    <prop key="description.it">Identifica l' utente presso l'organizzazione</prop>
-                    <prop key="description.ja">所属機関における利用者の従業員番号</prop>
-                    <prop key="description.pt">Número de empregado</prop>
-                    <prop key="description.sv">Anställningsnummer: Unik anställningsidentifierare i hemmaorganisationen.</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">employeeType</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:2.16.840.1.113730.3.1.4</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:employeeType</prop>
-                    <prop key="displayName.en">Employee type</prop>
-                    <prop key="description.en">Employee type</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">jpegPhoto</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:0.9.2342.19200300.100.1.60</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:jpegPhoto</prop>
-                    <prop key="displayName.en">JPEG Photo</prop>
-                    <prop key="description.en">Image of a person in JPEG format</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">preferredLanguage</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:2.16.840.1.113730.3.1.39</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:preferredLanguage</prop>
-                    <prop key="displayName.en">Preferred Language</prop>
-                    <prop key="displayName.de">Bevorzugte Sprache</prop>
-                    <prop key="displayName.fr">Langue préférée</prop>
-                    <prop key="displayName.it">Lingua preferita</prop>
-                    <prop key="displayName.ja">希望言語</prop>
-                    <prop key="displayName.pt">Língua preferida</prop>
-                    <prop key="displayName.sv">Språkönskemål</prop>
-                    <prop key="description.en">Preferred language: Users preferred language (see RFC1766)</prop>
-                    <prop key="description.de">Bevorzugte Sprache (siehe RFC1766)</prop>
-                    <prop key="description.fr">Exemple: fr, de, it, en, ... (voir RFC1766)</prop>
-                    <prop key="description.it">Lingua preferita: la lingua preferita dall'utente (cfr. RFC1766)</prop>
-                    <prop key="description.ja">利用者が希望する言語(RFC1766 を参照)</prop>
-                    <prop key="description.pt">Língua preferida: Língua preferida do utilizador (cfr. RFC1766)</prop>
-                    <prop key="description.sv">Språkönskemål: Personens önskade språk (see RFC1766).</prop>
-                </props>
-            </property>
-        </bean>
-
-        <!-- Schema: eduPerson attributes -->
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">eduPersonAffiliation</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:1.3.6.1.4.1.5923.1.1.1.1</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:eduPersonAffiliation</prop>
-                    <prop key="displayName.en">Affiliation</prop>
-                    <prop key="displayName.de">Zugehörigkeit</prop>
-                    <prop key="displayName.fr">Affiliation</prop>
-                    <prop key="displayName.it">Tipo di membro</prop>
-                    <prop key="displayName.ja">職位</prop>
-                    <prop key="displayName.pt">Tipo de utilizador</prop>
-                    <prop key="displayName.sv">Anknytning</prop>
-                    <prop key="description.en">Affiliation: Type of affiliation with Home Organization</prop>
-                    <prop key="description.de">Art der Zugehörigkeit zur Heimatorganisation</prop>
-                    <prop key="description.de-ch">Art der Zugehörigkeit zur Heimorganisation</prop>
-                    <prop key="description.fr">Type d'affiliation dans l'organisation</prop>
-                    <prop key="description.it">Tipo di membro: Tipo di lavoro svolto per l'organizzazione</prop>
-                    <prop key="description.ja">所属機関における職位(faculty，staff，student，memberなど)</prop>
-                    <prop key="description.pt">Tipo de utilizador: tipo de utilizador na organização. Exemplo: Estudante, ...</prop>
-                    <prop key="description.sv">Anknytning: Vilken anknytning personen har till organisationen.</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">eduPersonEntitlement</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:1.3.6.1.4.1.5923.1.1.1.7</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:eduPersonEntitlement</prop>
-                    <prop key="displayName.en">Entitlement</prop>
-                    <prop key="displayName.de">Berechtigung</prop>
-                    <prop key="displayName.fr">Entitlement</prop>
-                    <prop key="displayName.it">Prerogativa</prop>
-                    <prop key="displayName.ja">資格情報</prop>
-                    <prop key="displayName.pt">Título</prop>
-                    <prop key="displayName.sv">Rättigheter</prop>
-                    <prop key="description.en">Member of: URI (either URL or URN) that indicates a set of rights to specific resources based on an agreement across the releavant community</prop>
-                    <prop key="description.de">Zeichenkette, die Rechte für spezifische Ressourcen beschreibt</prop>
-                    <prop key="description.fr">Membre de: URI (soit une URL ou une URN) décrivant un droit spécific d'accès.</prop>
-                    <prop key="description.it">Membro delle seguenti URI (sia URL o URN) che rappresentano diritti specifici d'accesso validi in tutta la communità</prop>
-                    <prop key="description.ja">特定のアプリケーションもしくはコミュニティ内の複数リソースへのアクセス権限を持つことを示すURI(URLもしくはURN)</prop>
-                    <prop key="description.pt">URI (retractado por um URN ou URL) que indica um conjunto de direitos para recursos específicos. </prop>
-                    <prop key="description.sv">Rättigheter: URI (either URL or URN) som beskriver olika rättigheter till angivna tjänster.</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">eduPersonNickname</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:1.3.6.1.4.1.5923.1.1.1.2</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:eduPersonNickname</prop>
-                    <prop key="displayName.en">Nick name</prop>
-                    <prop key="displayName.de">Kurzname</prop>
-                    <prop key="displayName.de-ch">Übername</prop>
-                    <prop key="displayName.fr">Surnom</prop>
-                    <prop key="displayName.it">Diminutivo</prop>
-                    <prop key="displayName.ja">ニックネーム</prop>
-                    <prop key="description.en">Person's nickname, or the informal name by which they are accustomed to be hailed.</prop>
-                    <prop key="description.de">Kurzname einer Person, oder üblicher Rufname zur Begrüßung.</prop>
-                    <prop key="description.de-ch">Übername einer Person, oder üblicher Rufname zur Begrüssung.</prop>
-                    <prop key="description.fr">Nom personnalisable pour un usage informel.</prop>
-                    <prop key="description.it">Diminutivo della persona, o  soprannome.</prop>
-                    <prop key="description.ja">利用者のニックネームもしくは通称</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">eduPersonPrimaryAffiliation</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:1.3.6.1.4.1.5923.1.1.1.5</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:eduPersonPrimaryAffiliation</prop>
-                    <prop key="displayName.en">Primary affiliation</prop>
-                    <prop key="displayName.de">Primäre Zugehörigkeit</prop>
-                    <prop key="displayName.fr">Affiliation pricipale</prop>
-                    <prop key="displayName.it">Appartenenza principale</prop>
-                    <prop key="displayName.ja">主要職位</prop>
-                    <prop key="description.en">Specifies the person's primary relationship to the institution in broad categories such as student, faculty, staff, alum, etc.</prop>
-                    <prop key="description.de">Spezifiziert der Hauptbeziehung einer Person innerhalb ihrer Organisation in groben Kategorien wie Student, Mitarbeiter, Alumni, etc.</prop>
-                    <prop key="description.fr">Spécifie la relation principale d'une personne avec l'institution selon des majeures catégories comme étudiant, collaborateur, alumni etc.</prop>
-                    <prop key="description.it">Specifica la relazione principale dell persona con l'istituzione secondo le maggiori categorie come studente, collaboratore, alumni, etc.</prop>
-                    <prop key="description.ja">所属機関における主要な職位(faculty，staff，student，memberなど)</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">eduPersonPrincipalName</prop>
-                    <prop key="transcoder">SAML2ScopedStringTranscoder SAML1ScopedStringTranscoder CASScopedStringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:1.3.6.1.4.1.5923.1.1.1.6</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:eduPersonPrincipalName</prop>
-                    <prop key="displayName.en">Principal Name</prop>
-                    <prop key="displayName.de">Persönliche ID</prop>
-                    <prop key="displayName.fr">Principal Name</prop>
-                    <prop key="displayName.it">Principal Name</prop>
-                    <prop key="displayName.ja">プリンシパルID</prop>
-                    <prop key="description.en">A unique identifier for a person, mainly for inter-institutional user identification.</prop>
-                    <prop key="description.de">Eindeutige Benutzeridentifikation</prop>
-                    <prop key="description.de-ch">Eindeutige Benützeridentifikation</prop>
-                    <prop key="description.fr">L'identifiant unique de l'utilisateur</prop>
-                    <prop key="description.it">Un ID personale che identifica chiaramente l'utente in seno alla sua organizzazione</prop>
-                    <prop key="description.ja">フェデレーション内で一意かつ永続的な利用者識別子</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">eduPersonPrincipalNamePrior</prop>
-                    <prop key="transcoder">SAML2ScopedStringTranscoder SAML1ScopedStringTranscoder CASScopedStringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:1.3.6.1.4.1.5923.1.1.1.12</prop>
-                    <prop key="saml1.name">urn:oid:1.3.6.1.4.1.5923.1.1.1.12</prop>
-                    <prop key="displayName.en">Prior Principal Name</prop>
-                    <prop key="description.en">eduPersonPrincipalName value that was previously associated with the entry.</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">eduPersonScopedAffiliation</prop>
-                    <prop key="transcoder">SAML2ScopedStringTranscoder SAML1ScopedStringTranscoder CASScopedStringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:1.3.6.1.4.1.5923.1.1.1.9</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:eduPersonScopedAffiliation</prop>
-                    <prop key="displayName.en">Scoped Affiliation</prop>
-                    <prop key="displayName.de">Zugehörigkeit</prop>
-                    <prop key="displayName.fr">Affiliation</prop>
-                    <prop key="displayName.it">Tipo di membro</prop>
-                    <prop key="displayName.ja">スコープ付き職位</prop>
-                    <prop key="description.en">Specifies the person's affiliation within a particular security domain</prop>
-                    <prop key="description.de">Art der Zugehörigkeit zur Heimatorganisation</prop>
-                    <prop key="description.de-ch">Art der Zugehörigkeit zur Heimorganisation</prop>
-                    <prop key="description.fr">Type d'affiliation dans l'organisation</prop>
-                    <prop key="description.it">Tipo di membro: Tipo di lavoro svolto per l'organizzazione</prop>
-                    <prop key="description.ja">セキュリティドメインのスコープが付いた所属機関における職位</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">eduPersonAssurance</prop>
-                    <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:1.3.6.1.4.1.5923.1.1.1.11</prop>
-                    <prop key="saml1.name">urn:mace:dir:attribute-def:eduPersonAssurance</prop>
-                    <prop key="displayName.en">Assurance Level</prop>
-                    <prop key="displayName.de">Vertrauensgrad</prop>
-                    <prop key="displayName.fr">Niveau de confiance</prop>
-                    <prop key="displayName.it">Livello di sicurezza</prop>
-                    <prop key="displayName.ja">保証レベル</prop>
-                    <prop key="description.en">Set of URIs that assert compliance with specific standards for identity assurance.</prop>
-                    <prop key="description.de">URIs die eine gewisse Zusicherung für spezifische Standards des Vertrauens beinhalten</prop>
-                    <prop key="description.fr">Un ensemble d'URI qui attestent la conformité selon un standard pour les niveaux d'assurance d'identités</prop>
-                    <prop key="description.it">Un insieme di URI che asseriscono l'osservanza dei livelli di sicurezza richiesti</prop>
-                    <prop key="description.ja">IDの保証レベルに関して特定の基準に準拠していることを示すURI</prop>
-                </props>
-            </property>
-        </bean>
-
-        <!-- Semi-deprecated eduPersonUniqueId, should be phased out in favor of SAML subject-id replacement below. -->
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">eduPersonUniqueId</prop>
-                    <prop key="transcoder">SAML2ScopedStringTranscoder SAML1ScopedStringTranscoder CASScopedStringTranscoder</prop>
-                    <prop key="saml2.name">urn:oid:1.3.6.1.4.1.5923.1.1.1.13</prop>
-                    <prop key="saml1.name">urn:oid:1.3.6.1.4.1.5923.1.1.1.13</prop>
-                    <prop key="displayName.en">Unique ID</prop>
-                    <prop key="displayName.de">Eindeutige ID</prop>
-                    <prop key="displayName.fr">ID unique</prop>
-                    <prop key="displayName.it">ID unico</prop>
-                    <prop key="displayName.ja">ユニークID</prop>
-                    <prop key="displayName.pt">ID único</prop>
-                    <prop key="displayName.sv">Unik identifierare</prop>
-                    <prop key="description.en">A unique identifier for a person, mainly for inter-institutional user identification.</prop>
-                    <prop key="description.de">Eindeutige Benutzeridentifikation</prop>
-                    <prop key="description.de-ch">Eindeutige Benützeridentifikation</prop>
-                    <prop key="description.fr">Identifiant unique de l'utilisateur</prop>
-                    <prop key="description.it">Un identificativo personale che identifica chiaramente l'utente in seno alla sua organizzazione</prop>
-                    <prop key="description.ja">フェデレーション内で一意で永続的かつ難読化された利用者識別子(後継はサブジェクトID)</prop>
-                    <prop key="description.pt">ID único: Identificador pessoal que identifica claramente o utilizador na sua organização</prop>
-                    <prop key="description.sv">Unik identifierare: En unik identifierare för en person, används primärt för att identifiera personen inloggning vid annan organisation än hemmaorganisationen.</prop>
-                </props>
-            </property>
-        </bean>
-
-        <!-- Schema: SAML Subject ID Attributes -->
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">samlSubjectID</prop>
-                    <prop key="transcoder">SAML2ScopedStringTranscoder</prop>
-                    <prop key="saml2.name">urn:oasis:names:tc:SAML:attribute:subject-id</prop>
-                    <prop key="displayName.en">Unique ID</prop>
-                    <prop key="displayName.de">Eindeutige ID</prop>
-                    <prop key="displayName.fr">ID unique</prop>
-                    <prop key="displayName.it">ID unico</prop>
-                    <prop key="displayName.ja">サブジェクトID</prop>
-                    <prop key="description.en">A unique identifier for a person, mainly for inter-institutional user identification.</prop>
-                    <prop key="description.de">Eindeutige Benutzeridentifikation</prop>
-                    <prop key="description.de-ch">Eindeutige Benützeridentifikation</prop>
-                    <prop key="description.fr">Identifiant unique de l'utilisateur</prop>
-                    <prop key="description.it">Un identificativo personale che identifica chiaramente l'utente in seno alla sua organizzazione</prop>
-                    <prop key="description.ja">フェデレーション内で一意で永続的かつ難読化された利用者識別子(eduPersonUniqueIdの後継)</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">samlPairwiseID</prop>
-                    <prop key="transcoder">SAML2ScopedStringTranscoder</prop>
-                    <prop key="saml2.name">urn:oasis:names:tc:SAML:attribute:pairwise-id</prop>
-                    <prop key="displayName.en">Pairwise ID</prop>
-                    <prop key="displayName.de">Pairwise ID</prop>
-                    <prop key="displayName.fr">Pairwise ID</prop>
-                    <prop key="displayName.it">Pairwise ID</prop>
-                    <prop key="displayName.ja">ペアワイズID</prop>
-                    <prop key="description.en">Pairwise ID: A unique identifier for a person, different for each service provider.</prop>
-                    <prop key="description.de">Pairwise ID: Eindeutige Benutzeridentifikation, unterschiedlich pro Service Provider.</prop>
-                    <prop key="description.de-ch">Pairwise ID: Eindeutige Benützeridentifikation, unterschiedlich pro Service Provider.</prop>
-                    <prop key="description.fr">Pairwise ID: Un identifiant unique de l'utilisateur, différent pour chaque fournisseur de service.</prop>
-                    <prop key="description.it">Pairwise ID: identificativo unico della persona, differente per ogni fornitore di servizio.</prop>
-                    <prop key="description.ja">フェデレーション内で一意かつSP毎に送出される値が異なる利用者識別子(eduPersonTargetedIDの後継)</prop>
-                </props>
-            </property>
-        </bean>
-
-    </list>
-    </constructor-arg>
-    </bean>
-    
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/audit.xml b/test-compose/idp/container_files/config/shib-idp/conf/audit.xml
deleted file mode 100644
index a690ae0..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/audit.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
-    xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
-    default-init-method="initialize"
-    default-destroy-method="destroy">
-
-    <!--
-    This bean defines a mapping between audit log categories and formatting strings. The default entry is
-    for compatibility with V2 audit logging.
-    -->
-    <util:map id="shibboleth.AuditFormattingMap">
-        <entry key="Shibboleth-Audit" value="%T|%b|%I|%SP|%P|%IDP|%bb|%III|%u|%ac|%attr|%n|%i|%XX|%X" />
-    </util:map>
-
-    <!-- Override the format of date/time fields in the log and/or convert to default time zone. -->
-    <!--
-    <bean id="shibboleth.AuditDateTimeFormat" class="java.lang.String" c:_0="YYYY-MM-dd'T'HH:mm:ss.SSSZZ" />
-    <util:constant id="shibboleth.AuditDefaultTimeZone" static-field="java.lang.Boolean.TRUE" />
-    -->
-
-    <!-- Allows auditing to be disabled selectively for particular profiles/flows. -->
-    <util:list id="shibboleth.AuditSuppressedProfiles">
-        <value>http://shibboleth.net/ns/profiles/status</value>
-        <value>http://shibboleth.net/ns/profiles/mdquery</value>
-    </util:list>
-
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/authn/authn-comparison.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/authn-comparison.xml
deleted file mode 100644
index dcf0271..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/authn/authn-comparison.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <!--
-    These beans can be used in the AuthnComparisonRules map below instead of the defaults to
-    support more advanced matching rules. The top example shows how to configure a matching rule,
-    in this case a rule that the two listed classes are "better" than the password class.
-    
-    To use these beans, configure the matchingRules map as desired, and then reference the bean id in the
-    desired value-ref slot in the AuthnComparisonRules map.
-    -->
-    
-    <bean id="shibboleth.BetterClassRefMatchFactory" parent="shibboleth.InexactMatchFactory">
-        <!--
-        <property name="matchingRules">
-            <map>
-                <entry key="urn:oasis:names:tc:SAML:2.0:ac:classes:Password">
-                    <list>
-                        <value>urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport</value>
-                        <value>urn:oasis:names:tc:SAML:2.0:ac:classes:TimeSyncToken</value>
-                    </list>
-                </entry>
-            </map>
-        </property>
-        -->
-    </bean>
-
-    <bean id="shibboleth.MinimumClassRefMatchFactory" parent="shibboleth.InexactMatchFactory" />
-
-    <bean id="shibboleth.MaximumClassRefMatchFactory" parent="shibboleth.InexactMatchFactory" />
-
-    <!-- DeclRefs are rarely used in SAML, so you likely won't bother with these. -->
-    <bean id="shibboleth.BetterDeclRefMatchFactory" parent="shibboleth.InexactMatchFactory" />
-    <bean id="shibboleth.MinimumDeclRefMatchFactory" parent="shibboleth.InexactMatchFactory" />
-    <bean id="shibboleth.MaximumDeclRefMatchFactory" parent="shibboleth.InexactMatchFactory" />
-    
-    
-    <!-- Registry of matching rules. -->
-    
-    <util:map id="shibboleth.AuthnComparisonRules">
-    
-        <!-- Exact matching, should be left alone to avoid tricking the IdP into behaving incorrectly. -->
-        <entry key-ref="shibboleth.SAMLAuthnMethodExact" value-ref="shibboleth.ExactMatchFactory"/>
-        <entry key-ref="shibboleth.SAMLACClassRefExact" value-ref="shibboleth.ExactMatchFactory"/>
-        <entry key-ref="shibboleth.SAMLACDeclRefExact" value-ref="shibboleth.ExactMatchFactory"/>
-
-        <!-- Minimum matching, leave to allow degeneration into exact, or replace with custom rules. -->
-        <entry key-ref="shibboleth.SAMLACClassRefMinimum" value-ref="shibboleth.ExactMatchFactory"/>
-        <entry key-ref="shibboleth.SAMLACDeclRefMinimum" value-ref="shibboleth.ExactMatchFactory"/>
-
-        <!-- Maximum matching, leave to allow degeneration into exact, or replace with custom rules. -->
-        <entry key-ref="shibboleth.SAMLACClassRefMaximum" value-ref="shibboleth.ExactMatchFactory"/>
-        <entry key-ref="shibboleth.SAMLACDeclRefMaximum" value-ref="shibboleth.ExactMatchFactory"/>
-
-        <!-- Better matching, refers to empty ruleset that has to be populated to work. -->
-        <entry key-ref="shibboleth.SAMLACClassRefBetter" value-ref="shibboleth.BetterClassRefMatchFactory"/>
-        <entry key-ref="shibboleth.SAMLACDeclRefBetter" value-ref="shibboleth.BetterDeclRefMatchFactory"/>
-        
-    </util:map>
-    
-    <!-- List of context classes or declarations to ignore if an SP requests them. -->
-
-    <util:list id="shibboleth.IgnoredContexts">
-        <value>urn:oasis:names:tc:SAML:2.0:ac:classes:unspecified</value>
-    </util:list>
-    
-    <!--
-    Mappings to transform custom Principals for proxied AuthnRequests.
-    Key is the input, value is a collection of possibly empty outputs.
-    Used by default to transform authentication type values from
-    SPs -> Proxied IdPs.
-    -->
-    <util:map id="shibboleth.PrincipalProxyRequestMappings">
-        <!--
-        <entry>
-            <key>
-                <bean parent="shibboleth.SAML1AuthenticationMethod"
-                    c:classRef="https://sp.example.org/context" />
-            </key>
-            <list>
-                <bean parent="shibboleth.SAML2AuthnContextClassRef"
-                    c:classRef="https://proxy.example.org/context1" />
-                <bean parent="shibboleth.SAML2AuthnContextClassRef"
-                    c:classRef="https://proxy.example.org/context2" />
-            </list>
-        </entry>
-        <entry>
-            <key>
-                <bean parent="shibboleth.SAML2AuthnContextClassRef"
-                    c:classRef="https://sp.example.org/context" />
-            </key>
-            <list>
-                <bean parent="shibboleth.SAML2AuthnContextClassRef"
-                    c:classRef="https://proxy.example.org/context1" />
-                <bean parent="shibboleth.SAML2AuthnContextClassRef"
-                    c:classRef="https://proxy.example.org/context2" />
-            </list>
-        </entry>
-        -->
-    </util:map>
-
-    <!--
-    Mappings to transform proxied Principals for inclusion in Subjects.
-    Key is the input, value is a collection of possibly empty outputs.
-    Used by default to transform values from Proxied IdP. -> 
-    -->
-    <util:map id="shibboleth.PrincipalProxyResponseMappings">
-        <!--
-        <entry>
-            <key>
-                <bean parent="shibboleth.SAML2AuthnContextClassRef"
-                    c:classRef="https://proxy.example.org/context1" />
-            </key>
-            <list>
-                <bean parent="shibboleth.SAML1AuthenticationMethod"
-                    c:classRef="https://sp.example.org/context" />
-                <bean parent="shibboleth.SAML2AuthnContextClassRef"
-                    c:classRef="https://sp.example.org/context" />
-            </list>
-        </entry>
-        <entry>
-            <key>
-                <bean parent="shibboleth.SAML2AuthnContextClassRef"
-                    c:classRef="https://proxy.example.org/context2" />
-            </key>
-            <list>
-                <bean parent="shibboleth.SAML1AuthenticationMethod"
-                    c:classRef="https://sp.example.org/context" />
-                <bean parent="shibboleth.SAML2AuthnContextClassRef"
-                    c:classRef="https://sp.example.org/context" />
-            </list>
-        </entry>
-        -->
-    </util:map>
-    
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/authn/authn-events-flow.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/authn-events-flow.xml
deleted file mode 100644
index 8846677..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/authn/authn-events-flow.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<flow xmlns="http://www.springframework.org/schema/webflow"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"
-      abstract="true">
-
-    <!-- ADVANCED USE ONLY -->
-    
-    <!--
-    You can ignore this file unless you are creating your own custom login subflows that want to
-    report custom events in response to unusual error or warning conditions.
-    -->
-
-    <!-- Custom error events to reflect back from user-supplied login subflows. -->
-
-    <!-- <end-state id="MyCustomEvent" /> -->
-
-    <global-transitions>
-        <!-- <transition on="MyCustomEvent" to="MyCustomEvent" /> -->
-        <transition on="#{!'proceed'.equals(currentEvent.id)}" to="InvalidEvent" />
-    </global-transitions>
-
-</flow>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/authn/discovery-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/discovery-config.xml
deleted file mode 100644
index e21e3fd..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/authn/discovery-config.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <!-- Specify discovery service location. -->
-    
-    <bean id="shibboleth.authn.discoveryURL" class="java.lang.String"
-        c:_0="https://ds.example.org/shibboleth-ds/index.html" />
- 
-    <!-- Alternatively specify a Function<ProfileRequestContext,String> to return the URL. -->
-    <!--
-    <bean id="shibboleth.authn.discoveryURLStrategy"
-            parent="shibboleth.ContextFunction.Scripted" factory-method="inlineScript">
-        <constructor-arg>
-            <value>
-            <![CDATA[
-                "https://ds.example.org/shibboleth-ds/index.html";
-            ]]>
-            </value>
-        </constructor-arg>
-    </bean>
-    -->
- 
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/authn/duo-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/duo-authn-config.xml
deleted file mode 100644
index 2867f48..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/authn/duo-authn-config.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context"
-    xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p" xmlns:c="http://www.springframework.org/schema/c"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
-    default-init-method="initialize" default-destroy-method="destroy">
-
-    <!--
-    By default, the Duo flow will use statically-defined integrations defined with the
-    duo.properties file. If you need more flexibility, you can define a function bean
-    called "shibboleth.authn.Duo.DuoIntegrationStrategy" to return an instance of
-    net.shibboleth.idp.authn.duo.DuoIntegration based on the state of the request.
-    A second bean, "shibboleth.authn.Duo.NonBrowser.DuoIntegrationStrategy", can be
-    supplied to use the AuthAPI for non-browser profiles.
-
-    The Duo flow is designed to operate in conjunction with some other login flow,
-    usually orchestrated by the MFA login flow. It obtains the username to send to
-    Duo based on the output of the other login flow or a previous session with the
-    user. You can override that approach using a function bean called
-    "shibboleth.authn.Duo.UsernameLookupStrategy" to supply the username from a
-    different source.
-    
-    Various other beans are supported, per the documentation.
-    -->
-
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/authn/duo.properties b/test-compose/idp/container_files/config/shib-idp/conf/authn/duo.properties
deleted file mode 100644
index cb4b4aa..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/authn/duo.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-## Duo integration settings
-
-## Note: If upgrading from pre-3.3 IdP versions, you will need to manually add a pointer
-## to this property file to idp.properties.
-
-## The first set of properties support DuoWeb "iframe" integration.
-
-idp.duo.apiHost = hostname
-idp.duo.applicationKey = key
-idp.duo.integrationKey = key
-idp.duo.secretKey = key
-
-## The second set are used for direct AuthAPI usage for ECP support.
-## A seperate integration has to be created for this to work.
-
-#idp.duo.nonbrowser.apiHost = %{idp.duo.apiHost}
-#idp.duo.nonbrowser.applicationKey = key
-#idp.duo.nonbrowser.integrationKey = key
-#idp.duo.nonbrowser.secretKey = key
-
-## Request header names for Duo non-browser credentials.
-# idp.duo.nonbrowser.header.factor = X-Shibboleth-Duo-Factor
-# idp.duo.nonbrowser.header.device = X-Shibboleth-Duo-Device
-# idp.duo.nonbrowser.header.passcode = X-Shibboleth-Duo-Passcode
-
-## Enables auto selection of factor/device if not specified by client. 
-# idp.duo.nonbrowser.auto = true
-
-## Enables transmission of client address to Duo during authentication.
-# idp.duo.nonbrowser.clientAddressTrusted = true
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/authn/external-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/external-authn-config.xml
deleted file mode 100644
index 9d6652a..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/authn/external-authn-config.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <!-- Servlet context-relative path to wherever your implementation lives. -->
-    <bean id="shibboleth.authn.External.externalAuthnPath" class="java.lang.String"
-        c:_0="contextRelative:external.jsp" />
-
-    <!--
-    Default is to always use the path in the bean above. If you want to determine it
-    dynamically, define a bean called "shibboleth.authn.External.externalAuthnPathStrategy"
-    of type Function<ProfileRequestContext,String> that returns the path to use.
-    -->
-
-    <!--
-    Add authentication flow descriptor's supportedPrincipals collection to the resulting Subject?
-    You would normally only unset this if you plan to return a fully decorated Java Subject from your
-    external authentication source.
-    -->
-    <util:constant id="shibboleth.authn.External.addDefaultPrincipals" static-field="java.lang.Boolean.TRUE" />
-
-    <!--
-    <bean id="shibboleth.authn.External.matchExpression" class="java.util.regex.Pattern" factory-method="compile"
-        c:_0="^(.+)@example\.edu]$" />
-    -->
-
-    <!--
-    Define entries here to map error messages returned by external modules and classify them as particular
-    kinds of errors for use in your templates and as events in flows.
-
-    Keys are events to signal, values are error codes.
-
-    The examples here just allow external signaling of the exact type of condition to record.
-    
-    If you want to "fall-through" to other login flows, include a mapping to "ReselectFlow".
-    -->
-    <util:map id="shibboleth.authn.External.ClassifiedMessageMap">
-        <entry key="UnknownUsername">
-            <list>
-                <value>UnknownUsername</value>
-            </list>
-        </entry>
-        <entry key="InvalidPassword">
-            <list>
-                <value>InvalidPassword</value>
-            </list>
-        </entry>
-        <entry key="ExpiredPassword">
-            <list>
-                <value>ExpiredPassword</value>
-            </list>
-        </entry>
-        <entry key="ExpiringPassword">
-            <list>
-                <value>ExpiringPassword</value>
-            </list>
-        </entry>
-    </util:map>
-    
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/authn/function-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/function-authn-config.xml
deleted file mode 100644
index cf7876a..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/authn/function-authn-config.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <!--
-    Add authentication flow descriptor's supportedPrincipals collection to the resulting Subject?
-    You would normally only unset this if you plan to return a completely constructed Subject from
-    your authentication function.
-    -->
-    <util:constant id="shibboleth.authn.Function.addDefaultPrincipals" static-field="java.lang.Boolean.TRUE" />
-    
-    <!--
-    The entire flow depends on the execution of a function bean you supply. A pathological script example
-    is below. The function may return a String, Principal, Subject, or a null to signal failure.
-    -->
-    
-    <bean id="shibboleth.authn.Function.ResultLookupStrategy"
-            parent="shibboleth.ContextFunctions.Scripted" factory-method="inlineScript">
-        <constructor-arg>
-            <value>
-            <![CDATA[
-                null;
-            ]]>
-            </value>
-        </constructor-arg>
-    </bean>    
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/authn/general-authn.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/general-authn.xml
deleted file mode 100644
index b936f97..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/authn/general-authn.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <!--
-    This file provisions the IdP with information about the configured login mechanisms available for use.
-    The actual beans and subflows that make up those mechanisms are in their own files, but this pulls them
-    together with deployer-supplied metadata to describe them to the system.
-    
-    You can turn on and off individual mechanisms by adding and remove them here. Nothing left out will
-    be used, regardless any other files loaded by the Spring container.
-    
-    Flow defaults include: no support for IsPassive/ForceAuthn, support for non-browser clients enabled,
-    and default timeout and lifetime values set via properties. We also default to supporting the SAML 1/2
-    expressions for password-based authentication over a secure channel, so anything more exotic requires
-    customization, as the examples below for IP address and SPNEGO authentication illustrate.
-    -->
-
-    <util:list id="shibboleth.AvailableAuthenticationFlows">
-        
-        <bean id="authn/IPAddress" parent="shibboleth.AuthenticationFlow"
-                p:passiveAuthenticationSupported="true"
-                p:lifetime="PT60S" p:inactivityTimeout="PT60S">
-            <property name="supportedPrincipals">
-                <list>
-                    <bean parent="shibboleth.SAML2AuthnContextClassRef"
-                        c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:InternetProtocol" />
-                </list>
-            </property>
-        </bean>
-
-        <bean id="authn/SPNEGO" parent="shibboleth.AuthenticationFlow"
-                p:nonBrowserSupported="false">
-            <property name="supportedPrincipals">
-                <list>
-                    <bean parent="shibboleth.SAML2AuthnContextClassRef"
-                        c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:Kerberos" />
-                    <bean parent="shibboleth.SAML1AuthenticationMethod"
-                        c:method="urn:ietf:rfc:1510" />
-                </list>
-            </property>
-        </bean>
-        
-        <bean id="authn/Function" parent="shibboleth.AuthenticationFlow" />
-
-        <bean id="authn/X509" parent="shibboleth.AuthenticationFlow"
-                p:nonBrowserSupported="false">
-            <property name="supportedPrincipals">
-                <list>
-                    <bean parent="shibboleth.SAML2AuthnContextClassRef"
-                        c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:X509" />
-                    <bean parent="shibboleth.SAML2AuthnContextClassRef"
-                        c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:TLSClient" />
-                    <bean parent="shibboleth.SAML1AuthenticationMethod"
-                        c:method="urn:ietf:rfc:2246" />
-                </list>
-            </property>
-        </bean>
-
-        <bean id="authn/X509Internal" parent="shibboleth.AuthenticationFlow">
-            <property name="supportedPrincipals">
-                <list>
-                    <bean parent="shibboleth.SAML2AuthnContextClassRef"
-                        c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:X509" />
-                    <bean parent="shibboleth.SAML2AuthnContextClassRef"
-                        c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:TLSClient" />
-                    <bean parent="shibboleth.SAML1AuthenticationMethod"
-                        c:method="urn:ietf:rfc:2246" />
-                </list>
-            </property>
-        </bean>
-
-        <bean id="authn/Password" parent="shibboleth.AuthenticationFlow"
-                p:passiveAuthenticationSupported="true"
-                p:forcedAuthenticationSupported="true" />
-
-        <bean id="authn/Duo" parent="shibboleth.AuthenticationFlow"
-                p:forcedAuthenticationSupported="true"
-                p:nonBrowserSupported="false">
-            <!--
-            The list below should be changed to reflect whatever locally- or
-            community-defined values are appropriate to represent MFA. It is
-            strongly advised that the value not be specific to Duo or any
-            particular technology.
-            -->
-            <property name="supportedPrincipals">
-                <list>
-                    <bean parent="shibboleth.SAML2AuthnContextClassRef"
-                        c:classRef="http://example.org/ac/classes/mfa" />
-                    <bean parent="shibboleth.SAML1AuthenticationMethod"
-                        c:method="http://example.org/ac/classes/mfa" />
-                </list>
-            </property>
-        </bean>
-
-        <bean id="authn/MFA" parent="shibboleth.AuthenticationFlow"
-                p:passiveAuthenticationSupported="true"
-                p:forcedAuthenticationSupported="true">
-            <!--
-            The list below almost certainly requires changes, and should generally be the
-            union of any of the separate factors you combine in your particular MFA flow
-            rules. The example corresponds to the example in mfa-authn-config.xml that
-            combines IPAddress with Password.
-            -->
-            <property name="supportedPrincipals">
-                <list>
-                    <bean parent="shibboleth.SAML2AuthnContextClassRef"
-                        c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:InternetProtocol" />
-                    <bean parent="shibboleth.SAML2AuthnContextClassRef"
-                        c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport" />
-                    <bean parent="shibboleth.SAML2AuthnContextClassRef"
-                        c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:Password" />
-                    <bean parent="shibboleth.SAML1AuthenticationMethod"
-                        c:method="urn:oasis:names:tc:SAML:1.0:am:password" />
-                </list>
-            </property>
-        </bean>
-
-        <!-- This is a flow for proxied SAML authentication to another IdP. -->
-
-        <bean id="authn/SAML" parent="shibboleth.AuthenticationFlow"
-            p:nonBrowserSupported="false"
-            p:passiveAuthenticationSupported="true"
-            p:forcedAuthenticationSupported="true"
-            p:proxyScopingEnforced="true"
-            p:discoveryRequired="true" />
-
-        <!--
-        These flows are often, though not exclusively, used to proxy authentication, so may need
-        the proxyScopingEnforced flag enabled by hand to honor RP/local proxy count limits,
-        and may optionally trigger discovery via the discoveryRequired flag.
-        -->
-
-        <bean id="authn/External" parent="shibboleth.AuthenticationFlow"
-            p:nonBrowserSupported="false" />
-
-        <bean id="authn/RemoteUser" parent="shibboleth.AuthenticationFlow"
-            p:nonBrowserSupported="false" />
-
-        <bean id="authn/RemoteUserInternal" parent="shibboleth.AuthenticationFlow" />
-
-    </util:list>
-
-    <!--
-    This is a map used to "weight" particular methods above others if the IdP has to randomly select one
-    to insert into a SAML authentication statement. The typical use shown below is to bias the IdP in favor
-    of expressing the SAML 2 PasswordProtectedTransport class over the more vanilla Password class on the
-    assumption that the IdP doesn't accept passwords via an insecure channel. This map never causes the IdP
-    to violate its matching rules if an RP requests a particular value; it only matters when nothing specific
-    is chosen. Anything not in the map has a weight of zero.
-    -->
-    
-    <util:map id="shibboleth.AuthenticationPrincipalWeightMap">
-        <entry>
-            <key>
-                <bean parent="shibboleth.SAML2AuthnContextClassRef"
-                    c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport" />
-            </key>
-            <value>1</value>
-        </entry>
-    </util:map>
-
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/authn/ipaddress-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/ipaddress-authn-config.xml
deleted file mode 100644
index a3ee096..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/authn/ipaddress-authn-config.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-
-    <!-- Apply any regular expression replacement pairs to address before validation. -->
-    <util:list id="shibboleth.authn.IPAddress.Transforms" />
-
-    <!--
-    Configure the address range(s) and principal name(s) for IP-based login here.
-    The ranges provided MUST be CIDR network expressions. To specify a single address,
-    add "/32" or "/128" for IPv4 or IPv6 respectively.
-    -->
-
-
-    <util:map id="shibboleth.authn.IPAddress.Mappings">
-        <!--
-        <entry key="jdoe">
-            <list>
-                <value>127.0.0.1/32</value>
-                <value>::1/128</value>
-            </list>
-        </entry>
-        -->
-    </util:map>
-
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/authn/jaas-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/jaas-authn-config.xml
deleted file mode 100644
index 7edd41c..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/authn/jaas-authn-config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-    
-    <!-- Specify your JAAS config. -->
-    <bean id="JAASConfig" class="org.springframework.core.io.FileSystemResource" c:path="%{idp.home}/conf/authn/jaas.config" />
-    
-    <util:property-path id="shibboleth.authn.JAAS.JAASConfigURI" path="JAASConfig.URI" />
-    
-    <!-- Specify the application name(s) in the JAAS config. -->
-    <util:list id="shibboleth.authn.JAAS.LoginConfigNames">
-        <value>ShibUserPassAuth</value>
-    </util:list>
-
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/authn/jaas.config b/test-compose/idp/container_files/config/shib-idp/conf/authn/jaas.config
deleted file mode 100644
index 232e93d..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/authn/jaas.config
+++ /dev/null
@@ -1,11 +0,0 @@
-ShibUserPassAuth {
-    /*
-	com.sun.security.auth.module.Krb5LoginModule required;
-	*/
-
-    org.ldaptive.jaas.LdapLoginModule required
-      ldapUrl="ldap://localhost:10389"
-      baseDn="ou=people,dc=example,dc=org"
-      userFilter="uid={user}";
-
-};
\ No newline at end of file
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/authn/krb5-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/krb5-authn-config.xml
deleted file mode 100644
index f826f30..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/authn/krb5-authn-config.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-    
-    <util:constant id="shibboleth.authn.Krb5.RefreshConfig" static-field="java.lang.Boolean.FALSE" />
-
-    <util:constant id="shibboleth.authn.Krb5.PreserveTicket" static-field="java.lang.Boolean.FALSE" />
-
-    <!--
-    Uncomment these beans to perform KDC verification using a service principal and keytab.
-    The keytab bean must be an absolute file pathname and not a reference to a classpath resource,
-    so if idp.home is not a path, don't use it in the value.
-    -->
-    <!--
-    <bean id="shibboleth.authn.Krb5.ServicePrincipal" class="java.lang.String" c:_0="SERVICE/principal" />
-    <bean id="shibboleth.authn.Krb5.Keytab" class="java.lang.String" c:_0="%{idp.home}/credentials/keytab" />
-    -->
-
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/authn/ldap-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/ldap-authn-config.xml
deleted file mode 100644
index 22824d0..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/authn/ldap-authn-config.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p" xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-       default-init-method="initialize"
-       default-destroy-method="destroy"
-       default-lazy-init="true">
-
-    <!--
-    Default behavior is to rely on properties to populate the various beans.
-    You can override these, particularly shibboleth.authn.LDAP.authenticator,
-    to customize the settings or avoid use of properties.
-    
-    Be cautious of any direct dependency on ldaptive classes to simplify upgrades.
-    -->
-
-    <bean id="shibboleth.authn.LDAP.returnAttributes" parent="shibboleth.CommaDelimStringArray">
-        <constructor-arg type="java.lang.String" value="%{idp.authn.LDAP.returnAttributes:1.1}" />
-    </bean>
-
-    <bean id="shibboleth.authn.LDAP.trustCertificates" parent="shibboleth.X509ResourceCredentialConfig"
-        p:trustCertificates="%{idp.authn.LDAP.trustCertificates:undefined}" />
-        
-    <bean id="shibboleth.authn.LDAP.truststore" parent="shibboleth.KeystoreResourceCredentialConfig"
-        p:truststore="%{idp.authn.LDAP.trustStore:undefined}" />
-        
-    <bean id="shibboleth.authn.LDAP.authenticator" parent="shibboleth.LDAPAuthenticationFactory" />
-
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/authn/mfa-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/mfa-authn-config.xml
deleted file mode 100644
index 3bfbcbb..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/authn/mfa-authn-config.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <!--
-    This is a map of transition rules that guide the behavior of the MFA flow
-    and controls how factors are sequenced, skipped, etc. The key of each entry
-    is the name of the step/flow out of which control is passing. The starting
-    rule has an empty key.
-    
-    Each entry is a bean inherited from "shibboleth.authn.MFA.Transition". Per
-    the Javadoc for net.shibboleth.idp.authn.MultiFactorAuthenticationTransition:
-            
-        p:nextFlow (String)
-            - A flow to run if the previous step signaled a "proceed" event, for simple
-                transitions.
-                
-        p:nextFlowStrategy (Function<ProfileRequestContext,String>)
-            - A function to run if the previous step signaled a "proceed" event, for dynamic
-                transitions. Returning null ends the MFA process.
-            
-        p:nextFlowStrategyMap (Map<String,Object> where Object is String or Function<ProfileRequestContext,String>)
-            - Fully dynamic way of expressing control paths. Map is keyed by a previously
-                signaled event and the value is a flow to run or a function to
-                return the flow to run. Returning null ends the MFA process.
-                
-    When no rule is provided, there's an implicit "null" that ends the MFA flow
-    with whatever event was last signaled. If the "proceed" event from a step is
-    the final event, then the MFA process attempts to complete itself successfully.
-    -->
-    <util:map id="shibboleth.authn.MFA.TransitionMap">
-        <!-- First rule runs the IPAddress login flow. -->
-        <entry key="">
-            <bean parent="shibboleth.authn.MFA.Transition" p:nextFlow="authn/IPAddress" />
-        </entry>
-        
-        <!--
-        Second rule runs a function if IPAddress succeeds, to determine whether an additional
-        factor is required.
-        -->
-        <entry key="authn/IPAddress">
-            <bean parent="shibboleth.authn.MFA.Transition" p:nextFlowStrategy-ref="checkSecondFactor" />
-        </entry>
-        
-        <!-- An implicit final rule will return whatever the final flow returns. -->
-    </util:map>
-
-    <!-- Example script to see if second factor is required. -->
-    <bean id="checkSecondFactor" parent="shibboleth.ContextFunctions.Scripted" factory-method="inlineScript">
-        <constructor-arg>
-            <value>
-            <![CDATA[
-                nextFlow = "authn/Password";
-
-                // Check if second factor is necessary for request to be satisfied.
-                authCtx = input.getSubcontext("net.shibboleth.idp.authn.context.AuthenticationContext");
-                mfaCtx = authCtx.getSubcontext("net.shibboleth.idp.authn.context.MultiFactorAuthenticationContext");
-                if (mfaCtx.isAcceptable()) {
-                    nextFlow = null;
-                }
-                
-                nextFlow;   // pass control to second factor or end with the first
-            ]]>
-            </value>
-        </constructor-arg>
-    </bean>
-    
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/authn/password-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/password-authn-config.xml
deleted file mode 100644
index 502e73e..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/authn/password-authn-config.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-    
-    <!-- You can optionally comment out anything you don't need. -->
-    <import resource="jaas-authn-config.xml" />
-    <import resource="krb5-authn-config.xml" />
-    <import resource="ldap-authn-config.xml" />
-    
-    <!-- Names of form fields to pull username and password from. -->
-    <bean id="shibboleth.authn.Password.UsernameFieldName" class="java.lang.String" c:_0="j_username" />
-    <bean id="shibboleth.authn.Password.PasswordFieldName" class="java.lang.String" c:_0="j_password" />
-    <bean id="shibboleth.authn.Password.SSOBypassFieldName" class="java.lang.String" c:_0="donotcache" />
-
-    <!-- Simple transforms to apply to username before validation. -->
-    <util:constant id="shibboleth.authn.Password.Lowercase" static-field="java.lang.Boolean.FALSE"/>
-    <util:constant id="shibboleth.authn.Password.Uppercase" static-field="java.lang.Boolean.FALSE"/>
-    <util:constant id="shibboleth.authn.Password.Trim" static-field="java.lang.Boolean.TRUE"/>
-
-    <!-- Set to TRUE if you want the password kept in the resulting Subject as a private credential. -->
-    <util:constant id="shibboleth.authn.Password.RetainAsPrivateCredential" static-field="java.lang.Boolean.FALSE"/>
-
-    <!-- Apply any regular expression replacement pairs to username before validation. -->
-    <util:list id="shibboleth.authn.Password.Transforms">
-        <!--
-        <bean parent="shibboleth.Pair" p:first="^(.+)@example\.org$" p:second="$1" />
-        -->
-    </util:list>
-        
-    <!-- Ordered list of CredentialValidators to apply to a request. -->
-    <util:list id="shibboleth.authn.Password.Validators">
-        <ref bean="shibboleth.LDAPValidator" />
-    </util:list>
-    
-    <!-- Controls whether all validators in the above bean have to succeed, or just one. -->
-    <util:constant id="shibboleth.authn.Password.RequireAll" static-field="java.lang.Boolean.FALSE"/>
-    
-    <!-- Uncomment to configure account lockout backed by in-memory storage. -->
-    <!--
-    <bean id="shibboleth.authn.Password.AccountLockoutManager"
-        parent="shibboleth.StorageBackedAccountLockoutManager"
-        p:maxAttempts="5"
-        p:counterInterval="PT5M"
-        p:lockoutDuration="PT5M"
-        p:extendLockoutDuration="false" />
-    -->
-
-    <!--
-    Define entries here to map error messages detected by validation actions and classify them as particular
-    kinds of errors for use in your templates and as events in flows.
-
-    Keys are events to signal, values are error codes.
-    -->
-    <util:map id="shibboleth.authn.Password.ClassifiedMessageMap">
-        <entry key="UnknownUsername">
-            <list>
-                <value>NoCredentials</value>
-                <value>UnknownUsername</value>
-                <value>CLIENT_NOT_FOUND</value>
-                <value>Client not found</value>
-                <value>DN_RESOLUTION_FAILURE</value>
-            </list>
-        </entry>
-        <entry key="InvalidPassword">
-            <list>
-                <value>InvalidCredentials</value>
-                <value>PREAUTH_FAILED</value>
-                <value>INVALID_CREDENTIALS</value>
-                <value>Checksum failed</value>
-            </list>
-        </entry>
-        <entry key="AccountLocked">
-            <list>
-                <value>AccountLocked</value>
-                <value>Clients credentials have been revoked</value>
-            </list>
-        </entry>
-        <entry key="ExpiredPassword">
-            <list>
-                <value>PASSWORD_EXPIRED</value>
-            </list>
-        </entry>
-        <entry key="ExpiringPassword">
-            <list>
-                <value>ACCOUNT_WARNING</value>
-            </list>
-        </entry>
-        <entry key="RequestUnsupported">
-            <list>
-                <value>RequestUnsupported</value>
-            </list>
-        </entry>
-    </util:map>
-
-    <!--
-    Configuration of "extended" login methods to offer in the password login form.
-    
-    The String bean is a regular expression identifying the flows to offer. These flows
-    must also be enabled at the "top" level to be available for use.
-    
-    The ExtendedFlowParameters bean can be used to transfer custom parameters from the
-    login form into the context tree for use later by other flows.
-    
-    The last bean provides the set of custom Principals to use for results produced by the
-    Password flow itself. You would use this if you need the Password flow to run as a shell
-    to run the "extended" login methods, but want to limit its own results more narrowly.
-    -->
-    <!--
-    <bean id="shibboleth.authn.Password.ExtendedFlows" class="java.lang.String" c:_0="" />
-
-    <util:list id="shibboleth.authn.Password.ExtendedFlowParameters">
-    </util:list>
-
-    <util:list id="shibboleth.authn.Password.PrincipalOverride">
-        <bean parent="shibboleth.SAML2AuthnContextClassRef"
-            c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport" />
-        <bean parent="shibboleth.SAML2AuthnContextClassRef"
-            c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:Password" />
-        <bean parent="shibboleth.SAML1AuthenticationMethod"
-            c:method="urn:oasis:names:tc:SAML:1.0:am:password" />
-    </util:list>
-    -->
-    
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/authn/remoteuser-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/remoteuser-authn-config.xml
deleted file mode 100644
index 4b7e722..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/authn/remoteuser-authn-config.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <!-- Servlet context-relative path to wherever your implementation lives. -->
-    <bean id="shibboleth.authn.RemoteUser.externalAuthnPath" class="java.lang.String"
-        c:_0="contextRelative:Authn/RemoteUser" />
-    
-    <!--
-    Default is to always use the path in the bean above. If you want to determine it
-    dynamically, define a bean called "shibboleth.authn.RemoteUser.externalAuthnPathStrategy"
-    of type Function<ProfileRequestContext,String> that returns the path to use.
-    -->
-
-    <!--
-    Add authentication flow descriptor's supportedPrincipals collection to the resulting Subject?
-    You would normally only unset this if you plan to use the authnMethodHeader servlet parameter to
-    supply authentication method string(s) from the external authentication system.
-    -->
-    <util:constant id="shibboleth.authn.RemoteUser.addDefaultPrincipals" static-field="java.lang.Boolean.TRUE" />
-
-    <!--
-    <bean id="shibboleth.authn.RemoteUser.matchExpression" class="java.util.regex.Pattern" factory-method="compile"
-        c:_0="^(.+)@example\.edu]$" />
-    -->
-
-    <!--
-    Define entries here to map error messages returned by external modules and classify them as particular
-    kinds of errors for use in your templates and as events in flows.
-
-    Keys are events to signal, values are error codes.
-
-    The examples here just allow external signaling of an exact condition.
-    
-    If you want to "fall-through" to other login flows, include a mapping to "ReselectFlow".
-    -->
-    <util:map id="shibboleth.authn.RemoteUser.ClassifiedMessageMap">
-        <entry key="ReselectFlow">
-            <list>
-                <value>NoCredentials</value>
-            </list>
-        </entry>
-        <entry key="UnknownUsername">
-            <list>
-                <value>UnknownUsername</value>
-            </list>
-        </entry>
-        <entry key="InvalidPassword">
-            <list>
-                <value>InvalidPassword</value>
-            </list>
-        </entry>
-        <entry key="ExpiredPassword">
-            <list>
-                <value>ExpiredPassword</value>
-            </list>
-        </entry>
-        <entry key="ExpiringPassword">
-            <list>
-                <value>ExpiringPassword</value>
-            </list>
-        </entry>
-    </util:map>
-    
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/authn/remoteuser-internal-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/remoteuser-internal-authn-config.xml
deleted file mode 100644
index 9e68c85..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/authn/remoteuser-internal-authn-config.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <!-- Check getRemoteUser() for identity (the typical case). -->
-    <util:constant id="shibboleth.authn.RemoteUser.checkRemoteUser" static-field="java.lang.Boolean.TRUE"/>
-
-    <!-- Populate one or both of the lists below to define HTTP headers or Servlet Attributes to check. -->
-    
-    <util:list id="shibboleth.authn.RemoteUser.checkHeaders">
-        <!--
-        <value>User-Identity</value>
-        -->
-    </util:list>
-
-    <util:list id="shibboleth.authn.RemoteUser.checkAttributes">
-        <!--
-        <value>User-Identity</value>
-        -->
-    </util:list>
-    
-    <!-- Simple transforms to apply to username before validation. -->
-    <util:constant id="shibboleth.authn.RemoteUser.Lowercase" static-field="java.lang.Boolean.FALSE"/>
-    <util:constant id="shibboleth.authn.RemoteUser.Uppercase" static-field="java.lang.Boolean.FALSE"/>
-    <util:constant id="shibboleth.authn.RemoteUser.Trim" static-field="java.lang.Boolean.TRUE"/>
-
-    <!-- Apply any regular expression replacement pairs before validation. -->
-    <util:list id="shibboleth.authn.RemoteUser.Transforms">
-        <!--
-        <bean parent="shibboleth.Pair" p:first="^(.+)@example\.edu$" p:second="$1" />
-        -->
-    </util:list>
-    
-    <!-- Uncomment/configure to install username whitelist, blacklist, and/or match expressions. -->
-    
-    <util:list id="shibboleth.authn.RemoteUser.whitelistedUsernames">
-        <!--
-        <value>goodguy</value>
-        -->
-    </util:list>
-
-    <util:list id="shibboleth.authn.RemoteUser.blacklistedUsernames">
-        <!--
-        <value>badguy</value>
-        -->
-    </util:list>
-    
-    <!--
-    <bean id="shibboleth.authn.RemoteUser.matchExpression" class="java.util.regex.Pattern" factory-method="compile"
-        c:_0="^(.+)@example\.edu]$" />
-    -->
-    
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/authn/saml-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/saml-authn-config.xml
deleted file mode 100644
index 4ff55f9..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/authn/saml-authn-config.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <!--
-    Optional Function<ProfileRequest,String> to supply name of proxied IdP,
-    otherwise flow assumes IdP discovery has been performed already.
-    -->
-    <!--
-    <bean id="shibboleth.authn.SAML.discoveryFunction" parent="shibboleth.Functions.Constant"
-        c:target="https://idp.example.org/idp/shibboleth" />
-    -->
-    
-    <!--
-    Add authentication flow descriptor's supportedPrincipals collection to the
-    resulting Subject? This may be problematic if it happens without regard for
-    the information returned in the assertion from the IdP, so changing this is
-    likely to lead to violations of intent.
-    
-    Usually this should be left FALSE, and appropriate bidirectional mappings defined
-    via conf/authn/authn-comparison.xml to translate across the proxy boundary.
-    -->
-    <util:constant id="shibboleth.authn.SAML.addDefaultPrincipals" static-field="java.lang.Boolean.FALSE"/>
-
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/authn/spnego-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/spnego-authn-config.xml
deleted file mode 100644
index 6c0fa48..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/authn/spnego-authn-config.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <!--  General Configuration -->
-
-    <!--
-    Enforce running SPNEGO for all users, independent of user's autologin state.
-    TRUE means that SPNEGO login is always tried (if available).
-    FALSE means that SPNEGO login is run only if the user has enabled autologin.
-    -->
-    <util:constant id="shibboleth.authn.SPNEGO.EnforceRun" static-field="java.lang.Boolean.FALSE" />
-   
-    <!-- Kerberos Configuration-->
-
-    <!-- General Kerberos Settings -->
-    
-    <util:constant id="shibboleth.authn.SPNEGO.Krb5.RefreshConfig" static-field="java.lang.Boolean.FALSE" />
-
-    <!--  Kerberos Service Principal(s) -->
-    
-    <!--
-    For each service principal/realm, a "RealmSettings" bean must be created.
-    For each "RealmSettings" bean, the following settings are supported:
-      p:servicePrincipal: - kerberos service principal (required)
-      p:keytab:           - path to the keytab file containing the kerberos service principal's credentials
-                            (optional; either "p:keytab" or "p:password" is required)
-      p:password:         - kerberos service principal's password
-                            (optional; either "p:keytab" or "p:password" is required)
-    -->
-    <util:list id="shibboleth.authn.SPNEGO.Krb5.Realms">
-
-        <bean parent="shibboleth.KerberosRealmSettings"
-            p:servicePrincipal="HTTP/aai-logon.domain_a.com@DOMAIN_A.COM"
-            p:keytab="%{idp.home}/credentials/http_domainA.keytab" />
-
-    </util:list>
-
-    <!--
-    <bean id="shibboleth.authn.SPNEGO.matchExpression" class="java.util.regex.Pattern" factory-method="compile"
-        c:_0="^(.+)@example\.edu$" />
-    -->
-
-    <!--
-    Define entries here to map events or error messages returned by the SPNEGO module
-    and classify them as particular kinds of errors for use in your templates and as
-    events in flows.
-
-    Keys are events to signal, values are error codes.
-    -->
-    <util:map id="shibboleth.authn.SPNEGO.ClassifiedMessageMap">
-        <entry key="SPNEGONotAvailable">
-            <list>
-                <value>SPNEGONotAvailable</value>
-            </list>
-        </entry>
-        <entry key="NTLMUnsupported">
-            <list>
-                <value>NTLMUnsupported</value>
-            </list>
-        </entry>
-    </util:map>
- 
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/authn/x509-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/x509-authn-config.xml
deleted file mode 100644
index 18b015a..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/authn/x509-authn-config.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <!-- Servlet context-relative path to wherever your implementation lives. -->
-    <bean id="shibboleth.authn.X509.externalAuthnPath" class="java.lang.String"
-        c:_0="contextRelative:x509-prompt.jsp" />
-
-    <!--
-    Default is to always use the path in the bean above. If you want to determine it
-    dynamically, define a bean called "shibboleth.authn.X509.externalAuthnPathStrategy"
-    of type Function<ProfileRequestContext,String> that returns the path to use.
-    -->
-
-    <!--
-    Define entries here to map error messages returned by external modules and classify them as particular
-    kinds of errors for use in your templates and as events in flows.
-
-    Keys are events to signal, values are error codes.
-    
-    The examples here just allow external signaling of an exact condition.
-    
-    If you want to "fall-through" to other login flows, include a mapping to "ReselectFlow".
-    -->
-    <util:map id="shibboleth.authn.X509.ClassifiedMessageMap">
-        <entry key="ReselectFlow">
-            <list>
-                <value>NoCredentials</value>
-                <value>InvalidCredentials</value>
-            </list>
-        </entry>
-    </util:map>
-    
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/authn/x509-internal-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/x509-internal-authn-config.xml
deleted file mode 100644
index bad3029..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/authn/x509-internal-authn-config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <!--
-    You can define a TrustEngine to apply to any candidate certificates by defining a bean named
-    "shibboleth.authn.X509.TrustEngine". You could also define that in conf/global.xml if you need
-    to share one between the internal and external versions of this flow.
-    -->
-    
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/c14n/attribute-sourced-subject-c14n-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/c14n/attribute-sourced-subject-c14n-config.xml
deleted file mode 100644
index 938b30f..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/c14n/attribute-sourced-subject-c14n-config.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <!--
-    A list of attributes to resolve for normalizing the subject. For example, you might
-    intend to lookup a uid in a directory based on what the user entered. You can make this
-    an empty list if you just want to resolve everything you normally would.
-    -->
-    <util:list id="shibboleth.c14n.attribute.AttributesToResolve">
-        <value>altuid</value>
-    </util:list>
-    
-    <!--
-    A list of attributes to search for a value to produce as the normalized subject name.
-    This will normally be something you resolve above.
-    -->
-    <util:list id="shibboleth.c14n.attribute.AttributeSourceIds">
-        <value>altuid</value>
-    </util:list>
-
-    <!-- Simple transforms to apply to attribute value used for canonicalization result. -->
-    <util:constant id="shibboleth.c14n.attribute.Lowercase" static-field="java.lang.Boolean.FALSE"/>
-    <util:constant id="shibboleth.c14n.attribute.Uppercase" static-field="java.lang.Boolean.FALSE"/>
-    <util:constant id="shibboleth.c14n.attribute.Trim" static-field="java.lang.Boolean.TRUE"/>
-
-    <!-- Apply any regular expression replacement pairs. -->
-    <util:list id="shibboleth.c14n.attribute.Transforms">
-        <!--
-        <bean parent="shibboleth.Pair" p:first="^(.+)@example\.edu$" p:second="$1" />
-        -->
-    </util:list>
-        
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/c14n/simple-subject-c14n-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/c14n/simple-subject-c14n-config.xml
deleted file mode 100644
index 3cddfa6..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/c14n/simple-subject-c14n-config.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <!-- Simple transforms to apply to username after authentication. -->
-    <util:constant id="shibboleth.c14n.simple.Lowercase" static-field="java.lang.Boolean.FALSE"/>
-    <util:constant id="shibboleth.c14n.simple.Uppercase" static-field="java.lang.Boolean.FALSE"/>
-    <util:constant id="shibboleth.c14n.simple.Trim" static-field="java.lang.Boolean.TRUE"/>
-
-    <!-- Apply any regular expression replacement pairs after authentication. -->
-    <util:list id="shibboleth.c14n.simple.Transforms">
-        <!--
-        <bean parent="shibboleth.Pair" p:first="^(.+)@example\.edu$" p:second="$1" />
-        -->
-    </util:list>
-        
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/c14n/subject-c14n-events-flow.xml b/test-compose/idp/container_files/config/shib-idp/conf/c14n/subject-c14n-events-flow.xml
deleted file mode 100644
index c4936f3..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/c14n/subject-c14n-events-flow.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<flow xmlns="http://www.springframework.org/schema/webflow"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"
-      abstract="true">
-
-    <!-- ADVANCED USE ONLY -->
-    
-    <!--
-    You can ignore this file unless you are creating your own custom c14n subflows that want to
-    report custom events in response to unusual error or warning conditions.
-    -->
-
-    <!-- Custom error events to reflect back from user-supplied c14n subflows. -->
-    
-    <!-- <end-state id="MyCustomEvent" /> -->
-
-    <global-transitions>
-        <!-- <transition on="MyCustomEvent" to="MyCustomEvent" /> -->
-        <transition on="#{!'proceed'.equals(currentEvent.id)}" to="InvalidEvent" />
-    </global-transitions>
-
-</flow>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/c14n/subject-c14n.xml b/test-compose/idp/container_files/config/shib-idp/conf/c14n/subject-c14n.xml
deleted file mode 100644
index e4b772f..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/c14n/subject-c14n.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-    
-    <!-- ========================= Java Subject -> Principal Mapping ========================= -->
-
-    <!--
-    These are lists of Subject Canonicalization flows that turn complex Subject data into a string-based
-    principal name that the rest of the IdP can operate on. They're used primarily after authentication
-    and also during less common operations like SAML attribute queries, to map the SAML Subject into a
-    principal name.
-    
-    Flows are identified with an ID that corresponds to a Spring Web Flow subflow name.
-    -->
-
-    <!--
-    ====================================================================
-    Flows used after authentication to produce canonical principal name.
-    ====================================================================
-    -->
-    <util:list id="shibboleth.PostLoginSubjectCanonicalizationFlows">
-        <!--
-        This is an advanced post-login step that performs attribute resolution and then produces a username
-        from an attribute value. Most of this configuration is handled by attribute-sourced-c14n-config.xml.
-        To enable universally, just uncomment, but if you want it to run under more specific conditions,
-        set an activationCondition property to a condition function to use to control when it should run. 
-        -->
-        <!-- <bean id="c14n/attribute" parent="shibboleth.PostLoginSubjectCanonicalizationFlow" /> -->
-
-        <!--
-        This is an advanced option for use with SAML 2 proxy authentication to a second IdP that
-        derives the principal name semi-directly from the incoming NameID value. It is functionally
-        akin to the c14n/SAML2Transform flow for SAML Request scenarios, but separately defined so
-        a suitably restrictive format list and/or condition can be applied to it. 
-        -->
-        <!-- <ref bean="c14n/SAML2ProxyTransform" /> -->
-
-        <!--
-        This is an alternative that handles Subjects containing an X500Principal object and
-        allows extraction from the DN.
-        -->
-        <ref bean="c14n/x500" />
-
-        <!--
-        This is the standard post-login step that returns a username derived from the login process. If you
-        have more complex needs such as mapping a certificate DN into a principal name, an alternative may
-        be required such as that above, but you can configure simple transforms in simple-subject-c14n-config.xml
-        -->
-        <ref bean="c14n/simple" />
-    </util:list>
-    
-    <!-- What SAML NameID formats do you want to support direct transformations for while proxying? -->
-    <util:list id="shibboleth.ProxyNameTransformFormats">
-        <value>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</value>
-        <value>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</value>
-        <value>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</value>
-        <value>urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</value>
-        <value>urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos</value>
-    </util:list>
-    
-    <!--
-    Under what conditions should direct NameID mapping during proxying be allowed? By default, never.
-    Any condition can be used here; the example is suitable for enumerating a number of IdPs to allow.
-    -->
-    <bean id="shibboleth.ProxyNameTransformPredicate" parent="shibboleth.Conditions.ProxyAuthentication">
-        <constructor-arg name="collection">
-            <list>
-                <!-- <value>https://idp-proxy.example.org</value> -->
-            </list>
-        </constructor-arg>
-    </bean>
-    
-    <!--
-    Regular expression transforms to apply to incoming proxied subject names. The default empty list just
-    echoes the name through unmodified.
-    -->
-    <util:list id="shibboleth.ProxyNameTransforms">
-        <!--
-        <bean parent="shibboleth.Pair" p:first="^(.+)@example\.org$" p:second="$1" />
-        -->
-    </util:list>
-    
-    
-    <!--
-    =======================================================================
-    Flows used during SAML requests to reverse-map NameIdentifiers/NameIDs.
-    Below the list are some settings that might be useful to adjust.
-    =======================================================================
-    -->
-    <util:list id="shibboleth.SAMLSubjectCanonicalizationFlows">
-
-        <!-- The next four are for handling transient IDs (in-storage and stateless variants). -->
-        <ref bean="c14n/SAML2Transient" />
-        <ref bean="c14n/SAML2CryptoTransient" />
-        <ref bean="c14n/SAML1Transient" /> 
-        <ref bean="c14n/SAML1CryptoTransient" /> 
-        
-        <!-- Handle a SAML 2 persistent ID, provided a stored strategy is in use. -->
-        <!-- <ref bean="c14n/SAML2Persistent" /> -->
-        
-        <!--
-        Finally we have beans for decoding arbitrary SAML formats directly. By default, these are turned off,
-        having *no* circumstances for which they apply (see shibboleth.TransformNamePredicate below).
-        -->
-        <ref bean="c14n/SAML2Transform" />
-        <ref bean="c14n/SAML1Transform" />
-    </util:list>
-    
-    <!-- What SAML NameID formats do you want to support direct transformations for? -->
-    <util:list id="shibboleth.NameTransformFormats">
-        <value>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</value>
-        <value>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</value>
-        <value>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</value>
-        <value>urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</value>
-        <value>urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos</value>
-    </util:list>
-
-    <!--
-    Under what conditions should direct NameID mapping be allowed? By default, never.
-    Any condition can be used here; the example is suitable for enumerating a number of SPs to allow.
-    -->
-    <bean id="shibboleth.NameTransformPredicate" parent="shibboleth.Conditions.RelyingPartyId">
-        <constructor-arg name="candidates">
-            <list>
-                <!-- <value>https://sp.example.org</value> -->
-            </list>
-        </constructor-arg>
-    </bean>
-    
-    <!--
-    Regular expression transforms to apply to incoming subject names. The default empty list just
-    echoes the name through unmodified.
-    -->
-    <util:list id="shibboleth.NameTransforms">
-        <!--
-        <bean parent="shibboleth.Pair" p:first="^(.+)@example\.org$" p:second="$1" />
-        -->
-    </util:list>
-    
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/c14n/x500-subject-c14n-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/c14n/x500-subject-c14n-config.xml
deleted file mode 100644
index 1ae25e4..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/c14n/x500-subject-c14n-config.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <!-- First priority is given to any subjectAltNames specified (emailAddress is 1) -->
-    <util:list id="shibboleth.c14n.x500.SubjectAltNameTypes">
-        <!-- <value>1</value> -->
-    </util:list>
-
-    <!-- Second priority is a list of Certificate Subject RDN OIDs to look for. -->
-    <util:list id="shibboleth.c14n.x500.ObjectIDs">
-        <value>2.5.4.3</value>
-    </util:list>
-
-    <!-- Simple transforms to apply to username after authentication. -->
-    <util:constant id="shibboleth.c14n.x500.Lowercase" static-field="java.lang.Boolean.FALSE"/>
-    <util:constant id="shibboleth.c14n.x500.Uppercase" static-field="java.lang.Boolean.FALSE"/>
-    <util:constant id="shibboleth.c14n.x500.Trim" static-field="java.lang.Boolean.TRUE"/>
-
-    <!-- Apply any regular expression replacement pairs after authentication. -->
-    <util:list id="shibboleth.c14n.x500.Transforms">
-        <!--
-        <bean parent="shibboleth.Pair" p:first="^(.+)@example\.edu$" p:second="$1" />
-        -->
-    </util:list>
-        
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/cas-protocol.xml b/test-compose/idp/container_files/config/shib-idp/conf/cas-protocol.xml
deleted file mode 100644
index 2eb1733..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/cas-protocol.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <!--
-       | The CAS service registry defines verified relying parties by endpoint URI.
-       | The default implementation treats the ID of each entry as a regular expression defining a logical group of
-       | services whose URIs match the expression.
-       |
-       | This bean is reloaded periodically according to %{idp.home}/conf/services.properties.
-       -->
-    <bean id="reloadableServiceRegistry"
-          class="%{idp.cas.serviceRegistryClass:net.shibboleth.idp.cas.service.PatternServiceRegistry}">
-        <property name="definitions">
-            <list>
-                <!--
-                <bean class="net.shibboleth.idp.cas.service.ServiceDefinition"
-                      c:regex="https://([A-Za-z0-9_-]+\.)*example\.org(:\d+)?/.*"
-                      p:group="proxying-services"
-                      p:authorizedToProxy="true"
-                      p:singleLogoutParticipant="true" />
-                <bean class="net.shibboleth.idp.cas.service.ServiceDefinition"
-                      c:regex="http://([A-Za-z0-9_-]+\.)*example\.org(:\d+)?/.*"
-                      p:group="non-proxying-services"
-                      p:authorizedToProxy="false" /
-                -->
-            </list>
-        </property>
-    </bean>
-
-    <!--
-       | Uncomment this bean if you want to override the default list of CAS service registries.
-       | The default configuration tries to find the relying party in a SAML metadata source and falls back to
-       | reloadableServiceRegistry if a match is not found.
-       -->
-    <!--<util:list id="shibboleth.CASServiceRegistries">
-        <ref bean="shibboleth.CASMetadataServiceRegistry" />
-        <ref bean="shibboleth.CASServiceRegistry" />
-    </util:list>-->
-
-    <!--
-       | The default ticket service as of 3.3.0 serializes ticket data into the opaque section of the ticket ID
-       | for service tickets and proxy tickets. Proxy-granting tickets still require server-side storage, and
-       | a StorageService defined by the idp.cas.StorageService is used. Thus for deployers that do not require
-       | CAS proxy capabilities, no stateful storage mechanism is required; that means no memcached or database
-       | is required for HA deployments that want CAS (without proxy) support. A notable limitation of the new
-       | component is that the one-time use feature of service and proxy tickets is not available due to the lack
-       | of a ticket-tracking mechanism. Instead, tickets expire when their expiration period is exceeded.
-       | If this limitation is of concern, one may consider decreasing ticketValidityPeriod on the profile
-       | configuration from the default 15000ms.
-       -->
-    <alias name="encodingTicketService" alias="shibboleth.CASTicketService" />
-
-    <!--
-       | Uncomment the following element and comment out the above to enable the previous default ticket service
-       | that uses a StorageService for ticket persistence. Use this if the one-time use limitation of
-       | EncodingTicketService is problematic and can't be mitigated by decreasing ticketValidityPeriod.
-       -->
-    <!--<alias name="simpleTicketService" alias="shibboleth.CASTicketService" /> -->
-
-    <!--
-       | The predicate used to determine whether IdP session validation is performed during the process of granting
-       | a proxy ticket. When the predicate evaluates to true, an IdP session is resolved and validated prior to
-       | granting a proxy ticket. This feature prevents issuing proxy tickets when an IdP session is expired, but comes
-       | at the cost of requiring server-side storage of IdP session data. If this is configured to a predicate that
-       | evaluates to true under any condition, a server-side storage service must be enabled for IdP session
-       | storage. The most common non-default value is "alwaysTrue."
-       -->
-    <bean id="shibboleth.CASProxyValidateIdPSessionPredicate" parent="shibboleth.Conditions.FALSE" />
-
-    <!--
-       | Uncomment the following bean if you want to ignore jsessionid artifacts in service URLs.
-       | Those sorts of URLs are commonly emitted by Java servlet-based web applications.
-       -->
-    <!--<bean id="shibboleth.CASServiceComparator"
-          class="net.shibboleth.idp.cas.service.DefaultServiceComparator"
-          c:parameterNames="[a-z]+sessionid" />-->
-
-    <!--
-       | Define the list of static certificates that you trust to secure CAS proxy callback endpoints.
-       | Typically these are CA certificates and apply to _all_ CAS proxy callback endpoints.
-       | This facility complements the capability to supply relying-party-specific certificates in SAML metadata,
-       | which is the preferred mechanism to specify CAS proxy trust material. In the case of metadata, self-signed
-       | certificates are recommended.
-       -->
-    <util:list id="shibboleth.CASProxyTrustedCertificates" value-type="java.lang.String">
-        <!--<value>%{idp.home}/credentials/your_ca.pem</value>-->
-    </util:list>
-
-
-    <!-- ============== Advanced CAS Configuration ============== -->
-
-    <!-- Configure a third-party ticket service. -->
-    <!--
-    <bean id="shibboleth.CASTicketService"
-          class="org.example.idp.cas.CustomTicketService" />
-    -->
-</beans>
\ No newline at end of file
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/credentials.xml b/test-compose/idp/container_files/config/shib-idp/conf/credentials.xml
deleted file mode 100644
index dde530b..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/credentials.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <!--
-    NOTE: if you're using a legacy relying-party.xml file from a V2 configuration, this file is ignored.
-
-    This defines the signing and encryption key and certificate pairs referenced by your relying-party.xml
-    configuration. You don't normally need to touch this, unless you have advanced requirements such as
-    supporting multiple sets of keys for different relying parties, in which case you may want to define
-    all your credentials here for convenience.
-    -->
-
-    <!--
-    The list of ALL of your IdP's signing credentials. If you define additional signing credentials,
-    for example for specific relying parties or different key types, make sure to include them within this list.
-    -->
-    <util:list id="shibboleth.SigningCredentials">
-        <ref bean="shibboleth.DefaultSigningCredential" />
-    </util:list>
-    
-    <!-- Your IdP's default signing key, set via property file. -->
-    <bean id="shibboleth.DefaultSigningCredential"
-        class="net.shibboleth.idp.profile.spring.factory.BasicX509CredentialFactoryBean"
-        p:privateKeyResource="%{idp.signing.key}"
-        p:certificateResource="%{idp.signing.cert}"
-        p:entityId-ref="entityID" />
-        
-    <!-- Your IdP's default client TLS credential, by default the same as the default signing credential. -->
-    <alias alias="shibboleth.DefaultClientTLSCredential" name="shibboleth.DefaultSigningCredential" />
-    
-    <!--
-    The list of ALL of your IdP's encryption credentials. By default this is just an alias
-    for 'shibboleth.DefaultEncryptionCredentials'. It could be re-defined as
-    a list with additional credentials if needed.
-    -->
-    <alias alias="shibboleth.EncryptionCredentials" name="shibboleth.DefaultEncryptionCredentials" />
-        
-    <!-- Your IdP's default encryption (really decryption) keys, set via property file. -->
-    <util:list id="shibboleth.DefaultEncryptionCredentials">
-        <bean class="net.shibboleth.idp.profile.spring.factory.BasicX509CredentialFactoryBean"
-            p:privateKeyResource="%{idp.encryption.key}"
-            p:certificateResource="%{idp.encryption.cert}"
-            p:entityId-ref="entityID" />
-
-        <!--
-        For key rollover, uncomment and point to your original keypair, and use the one above
-        to point to your new keypair. Once metadata has propagated, comment this one out again.
-        -->
-        <!--
-        <bean class="net.shibboleth.idp.profile.spring.factory.BasicX509CredentialFactoryBean"
-            p:privateKeyResource="%{idp.encryption.key.2}"
-            p:certificateResource="%{idp.encryption.cert.2}"
-            p:entityId-ref="entityID" />
-        -->
-    </util:list>
-
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/errors.xml b/test-compose/idp/container_files/config/shib-idp/conf/errors.xml
deleted file mode 100644
index a5a8790..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/errors.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
-    xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
-    default-init-method="initialize"
-    default-destroy-method="destroy">
-
-    <bean id="shibboleth.DefaultErrorView" class="java.lang.String" c:_0="%{idp.errors.defaultView:error}" />
-
-    <!-- Map local events to alternate view templates. -->
-    <util:map id="shibboleth.EventViewMap">
-        <!-- <entry key="EventToChange" value="viewname" /> -->
-    </util:map>
-
-    <!--
-    Map of events to trap and handle with local views, without returning to SPs.
-    The map values are flags indicating whether to write an audit log record.
-    -->
-    <util:map id="shibboleth.LocalEventMap">
-        <entry key="ContextCheckDenied" value="true" />
-        <entry key="ImpersonationViolation" value="true" />
-        <entry key="AttributeReleaseRejected" value="true" />
-        <entry key="TermsRejected" value="true" />
-        <entry key="RuntimeException" value="false" />
-        <entry key="InvalidEvent" value="false" />
-        <entry key="InvalidCSRFToken" value="false" />
-        <!--
-        <entry key="IdentitySwitch" value="false" />
-        <entry key="NoPotentialFlow" value="false" />
-        -->
-    </util:map>
-    
-    <!-- Mappings of error events during requests to SAML status codes and SOAP fault codes. -->
-
-    <util:map id="shibboleth.SAML1StatusMappings">
-        <entry key="InvalidMessageVersion" value-ref="shibboleth.SAML1Status.VersionMismatch" />
-        
-        <entry key="UnableToDecode" value-ref="shibboleth.SAML1Status.Requester" />
-        
-        <entry key="UnableToEncode" value-ref="shibboleth.SAML1Status.Requester" />
-
-        <entry key="MessageReplay" value-ref="shibboleth.SAML1Status.Requester" />
-        <entry key="MessageExpired" value-ref="shibboleth.SAML1Status.Requester" />
-        <entry key="MessageAuthenticationError" value-ref="shibboleth.SAML1Status.Requester" />
-
-        <entry key="RequestUnsupported" value-ref="shibboleth.SAML1Status.Requester" />
-        
-        <entry key="NoPassive" value-ref="shibboleth.SAML1Status.Requester" />
-        <entry key="NoPotentialFlow" value-ref="shibboleth.SAML1Status.Requester" />
-        <entry key="NoCredentials" value-ref="shibboleth.SAML1Status.Requester" />
-        <entry key="InvalidCredentials" value-ref="shibboleth.SAML1Status.Requester" />
-        <entry key="AccountError" value-ref="shibboleth.SAML1Status.Requester" />
-        <entry key="IdentitySwitch" value-ref="shibboleth.SAML1Status.Requester" />
-        <entry key="AuthenticationException" value-ref="shibboleth.SAML1Status.Requester" />
-        
-        <entry key="InvalidSubject" value-ref="shibboleth.SAML1Status.Requester" />
-        <entry key="SubjectCanonicalizationError" value-ref="shibboleth.SAML1Status.Requester" />
-    </util:map>
-    
-    <util:map id="shibboleth.SAML2StatusMappings">
-        <entry key="InvalidMessageVersion" value-ref="shibboleth.SAML2Status.VersionMismatch" />
-        
-        <entry key="UnableToDecode" value-ref="shibboleth.SAML2Status.RequestUnsupported" />
-        
-        <entry key="UnableToEncode" value-ref="shibboleth.SAML2Status.UnsupportedBinding" />
-
-        <entry key="AccessDenied" value-ref="shibboleth.SAML2Status.RequestDenied" />
-        <entry key="MessageReplay" value-ref="shibboleth.SAML2Status.RequestDenied" />
-        <entry key="MessageExpired" value-ref="shibboleth.SAML2Status.RequestDenied" />
-        <entry key="MessageAuthenticationError" value-ref="shibboleth.SAML2Status.RequestDenied" />
-        
-        <entry key="RequestUnsupported" value-ref="shibboleth.SAML2Status.NoAuthnContext" />
-        
-        <entry key="NoPassive" value-ref="shibboleth.SAML2Status.NoPassive" />
-        
-        <entry key="NoPotentialFlow" value-ref="shibboleth.SAML2Status.AuthnFailed" />
-        <entry key="NoCredentials" value-ref="shibboleth.SAML2Status.AuthnFailed" />
-        <entry key="InvalidCredentials" value-ref="shibboleth.SAML2Status.AuthnFailed" />
-        <entry key="AccountError" value-ref="shibboleth.SAML2Status.AuthnFailed" />
-        <entry key="IdentitySwitch" value-ref="shibboleth.SAML2Status.AuthnFailed" />
-        <entry key="AuthenticationException" value-ref="shibboleth.SAML2Status.AuthnFailed" />
-        
-        <entry key="InvalidSubject" value-ref="shibboleth.SAML2Status.UnknownPrincipal" />
-        <entry key="SubjectCanonicalizationError" value-ref="shibboleth.SAML2Status.UnknownPrincipal" />
-        <entry key="SessionNotFound" value-ref="shibboleth.SAML2Status.UnknownPrincipal" />
-        
-        <entry key="InvalidNameIDPolicy" value-ref="shibboleth.SAML2Status.InvalidNameIDPolicy" />
-        <entry key="ProxyCountExceeded" value-ref="shibboleth.SAML2Status.ProxyCountExceeded" />
-        
-        <entry key="ChannelBindingsError" value-ref="shibboleth.SAML2Status.ChannelBindingsError" />
-    </util:map>
-
-    <util:map id="shibboleth.SOAPFaultCodeMappings">
-        <entry key="InvalidMessageVersion" value-ref="shibboleth.SOAP.VersionMismatch" />
-        
-        <entry key="UnableToDecode" value-ref="shibboleth.SOAP.Client" />
-
-        <entry key="MessageReplay" value-ref="shibboleth.SOAP.Client" />
-        <entry key="MessageExpired" value-ref="shibboleth.SOAP.Client" />
-        <entry key="MessageAuthenticationError" value-ref="shibboleth.SOAP.Client" />
-        
-        <entry key="RequestUnsupported" value-ref="shibboleth.SOAP.Client" />
-    
-        <entry key="NoPassive" value-ref="shibboleth.SOAP.Client" />
-        
-        <entry key="NoPotentialFlow" value-ref="shibboleth.SOAP.Client" />
-        <entry key="NoCredentials" value-ref="shibboleth.SOAP.Client" />
-        <entry key="InvalidCredentials" value-ref="shibboleth.SOAP.Client" />
-        <entry key="AccountError" value-ref="shibboleth.SOAP.Client" />
-        <entry key="AuthenticationException" value-ref="shibboleth.SOAP.Client" />
-
-        <entry key="InvalidSubject" value-ref="shibboleth.SOAP.Client" />
-        <entry key="SubjectCanonicalizationError" value-ref="shibboleth.SOAP.Client" />
-        
-        <entry key="InvalidNameIDPolicy" value-ref="shibboleth.SOAP.Client" />
-        
-        <entry key="ChannelBindingsError" value-ref="shibboleth.SOAP.Client" />
-    </util:map>
-    
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/global.xml b/test-compose/idp/container_files/config/shib-idp/conf/global.xml
deleted file mode 100644
index 457a814..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/global.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <!-- Use this file to define any custom beans needed globally. -->
-
-    <!--
-    Algorithm whitelists and blacklists that override or merge with library defaults. Normally you can leave
-    these empty or commented and use the system defaults, but you can override those defaults using these lists.
-    Each <value> element is an algorithm URI, or you can use <util:constant> elements in place of literal values.
-    -->
-    
-    <!--
-    <util:list id="shibboleth.SignatureWhitelist">
-    </util:list>
-
-    <util:list id="shibboleth.SignatureBlacklist">
-    </util:list>
-
-    <util:list id="shibboleth.EncryptionWhitelist">
-    </util:list>
-
-    <util:list id="shibboleth.EncryptionBlacklist">
-    </util:list>
-    -->
-
-    <!--
-    If you need to define and inject custom Java object(s) into the various views used throughout the
-    system (errors, login, logout, etc.), you can uncomment and define the bean below to be of any
-    type required. It will appear in the view scope as a variable named "custom".
-    
-    The example below defines the bean as a map, which allows you to inject multiple objects under
-    named keys to expand the feature to support multiple injected objects.
-    -->
-    
-    <!--
-    <util:map id="shibboleth.CustomViewContext">
-        <entry key="foo" value="bar"/>
-    </util:map>
-    -->
-    
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/intercept/consent-intercept-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/intercept/consent-intercept-config.xml
deleted file mode 100644
index 66f06a0..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/intercept/consent-intercept-config.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <!-- Terms of Use configuration -->
-    
-    <!--
-    Terms of use is driven by a lookup function returning a key into messages/consent-messages.properties
-    
-    The default mapping returns the relying party / SP name as the key. The second example below
-    demonstrates use of a custom mapping table from the relying party name to the key to use. 
-    -->
-    
-    <alias alias="shibboleth.consent.terms-of-use.Key" name="shibboleth.RelyingPartyIdLookup.Simple" />
-    
-    <!--
-    <bean id="shibboleth.consent.terms-of-use.Key" parent="shibboleth.Functions.Compose">
-        <constructor-arg name="g">
-            <bean class="com.google.common.base.Functions" factory-method="forMap" c:defaultValue="terms-of-use">
-                <constructor-arg name="map">
-                    <map>
-                        <entry key="https://sp.example.org/shibboleth" value="example-terms" />
-                    </map>
-                </constructor-arg>
-            </bean>
-        </constructor-arg>
-        <constructor-arg name="f">
-            <ref bean="shibboleth.RelyingPartyIdLookup.Simple" />
-        </constructor-arg>
-    </bean>
-    -->
-
-    <!-- Attribute Release configuration -->
-
-    <!--
-    Attribute release whitelist, blacklist, and match expressions to determine 
-    whether consent should be obtained for an attribute based on the attribute ID.
-    -->
-    
-    <util:list id="shibboleth.consent.attribute-release.WhitelistedAttributeIDs">
-        <!--
-        <value>mail</value>
-        -->
-    </util:list>
-
-    <util:list id="shibboleth.consent.attribute-release.BlacklistedAttributeIDs">
-        <value>transientId</value>
-        <value>persistentId</value>
-        <value>eduPersonTargetedID</value>
-    </util:list>
-
-    <!-- 
-    <bean id="shibboleth.consent.attribute-release.MatchExpression" class="java.util.regex.Pattern" factory-method="compile" 
-        c:_0="^exampleAttribute.*$" />
-    -->
-
-    <!--
-    Customize the order in which attributes are displayed.
-    Attribute IDs not present in this list will be sorted according to their
-    natural order and displayed subsequent to any attribute IDs specified here.
-    -->
-    <!--
-    <util:list id="shibboleth.consent.attribute-release.AttributeDisplayOrder">
-        <value>mail</value>
-    </util:list>
-    -->
-
-    <!--
-    These beans define mappings between audit log categories and formatting strings.
-    -->
-
-    <!--
-    For terms-of-use acceptance, the default entry is :
-     'YYYYMMDDTHHMMSSZ|TermsAccepted|jdoe|example-tou-1|rHo...rrw=|true'
-
-    For terms-of-use refusal, the default entry is :
-     'YYYYMMDDTHHMMSSZ|TermsRejected|jdoe|example-tou-1|rHo...rrw=|false'
-    -->
-    <util:map id="shibboleth.consent.terms-of-use.AuditFormattingMap">
-        <entry key="Shibboleth-Consent-Audit" value="%T|%SP|%e|%u|%CCI|%CCV|%CCA" />
-    </util:map>
-
-    <!--
-    For attribute-release consent, the default entry is :
-     'YYYYMMDDTHHMMSSZ|https://sp.example.org|AttributeReleaseConsent|jdoe|email,eduPersonAffiliation|rHo...rrw=,rHo...rrw=|false,false'
-    -->
-    <util:map id="shibboleth.consent.attribute-release.AuditFormattingMap">
-        <entry key="Shibboleth-Consent-Audit" value="%T|%SP|%e|%u|%CCI|%CCV|%CCA" />
-    </util:map>
-
-    <!--
-    Specify custom symbolic replacements for attribute names to shrink the size of results saved to client-side storage 
-    such as cookies.
-    -->
-    <bean id="shibboleth.consent.AttributeSymbolics" parent="shibboleth.consent.DefaultAttributeSymbolics" lazy-init="true">
-        <property name="sourceMap">
-            <map merge="true">
-                <!--
-                <entry key="myAttribute" value="900" />
-                -->
-            </map>
-        </property>
-    </bean>
-
-    <!--
-    Condition to evaluate to apply attribute-release consent to attribute queries.
-    -->
-    <bean id="shibboleth.consent.AttributeQuery.Condition" parent="shibboleth.Conditions.FALSE" />
-
-</beans>
\ No newline at end of file
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/intercept/context-check-intercept-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/intercept/context-check-intercept-config.xml
deleted file mode 100644
index aae07f0..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/intercept/context-check-intercept-config.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <!--
-    Condition to evaluate to interrupt SSO flows to check the state of the transaction before allowing.
-    
-    Typically the flow itself will be activated based on configuration in relying-party.xml, and this controls
-    whether to proceed if the flow is activated. The most common use for this flow is to check the set of
-    resolved/filtered attributes and values to see if the user is authorized or provisioned into a service.
-    -->
-    <bean id="shibboleth.context-check.Condition" parent="shibboleth.Conditions.AND">
-        <constructor-arg>
-            <list>
-                <bean parent="shibboleth.Conditions.RelyingPartyId" c:candidates="#{{'https://sp.example.org'}}" />
-                <bean class="net.shibboleth.idp.profile.logic.SimpleAttributePredicate"
-                        p:useUnfilteredAttributes="true">
-                    <property name="attributeValueMap">
-                        <map>
-                            <entry key="eppn">
-                                <list>
-                                    <value>*</value>
-                                </list>
-                            </entry>
-                        </map>
-                    </property>
-                </bean>
-            </list>
-        </constructor-arg>
-    </bean>
-
-    <!--
-    More general purpose approach using a Function that returns either "proceed" or a custom error Event.
-    This is a cleaner way of applying multiple conditions in different cases or triggering different events.
-    -->
-    <!--
-    <bean id="shibboleth.context-check.Function" parent="shibboleth.ContextFunctions.Scripted" factory-method="inlineScript"
-	        p:customObject-ref="shibboleth.context-check.Condition">
-        <constructor-arg>
-            <value>
-            <![CDATA[
-            var event = "proceed";
-            if (!custom.apply(input)) {
-                event = "ContextCheckDenied";
-            }
-            event;
-            ]]>
-            </value>
-        </constructor-arg>
-    </bean>
-    -->
-    
-</beans>
\ No newline at end of file
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/intercept/expiring-password-intercept-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/intercept/expiring-password-intercept-config.xml
deleted file mode 100644
index b3bf96d..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/intercept/expiring-password-intercept-config.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <!--
-    Condition to evaluate to determine if expiring password view should be displayed, false means to notify.
-    
-    The example uses a built-in class to evaluate an attribute containing a date/time of password expiration.
-    The format pattern parses the value and the negative offset determines how soon to warn the user beforehand.
-    -->
-    <bean id="shibboleth.expiring-password.Condition" class="net.shibboleth.idp.profile.logic.DateAttributePredicate"
-            c:attribute="passwordExpiration" c:formatString="yyyyMMddHHmmss'T'"
-            p:resultIfMissing="true" p:offset="-P14D" />
-    
-    <!-- Name of cookie to track when user was last notified. -->
-    <bean id="shibboleth.expiring-password.NotifyCookieName" class="java.lang.String" c:_0="shib_idp_exp_pwd" />
-
-    <!-- Interval (milliseconds) between notifications, default is 8 hours. -->
-    <bean id="shibboleth.expiring-password.NotifyInterval" class="java.lang.Long" c:_0="28800000" />
-    
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/intercept/external-intercept-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/intercept/external-intercept-config.xml
deleted file mode 100644
index 1d0fc29..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/intercept/external-intercept-config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <!-- Servlet context-relative path to wherever your implementation lives. -->
-    <bean id="shibboleth.intercept.externalPath" class="java.lang.String"
-        c:_0="contextRelative:intercept.jsp" />
-
-    <!--
-    Default is to always use the path in the bean above. If you want to determine it
-    dynamically, define a bean called "shibboleth.intercept.externalPathStrategy"
-    of type Function<ProfileRequestContext,String> that returns the path to use.
-    -->
-    
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/intercept/impersonate-intercept-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/intercept/impersonate-intercept-config.xml
deleted file mode 100644
index 7dfda2b..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/intercept/impersonate-intercept-config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <!--
-    Names of access control policies defined in access-control.xml to control impersonation.
-    The general policy runs first and determines whether to offer the impersonation option.
-    The specific policy runs second and determines whether to allow the requested impersonation.
-    -->
-
-    <bean id="shibboleth.impersonate.GeneralPolicy" class="java.lang.String" c:_0="GeneralImpersonationPolicy" />
-
-    <bean id="shibboleth.impersonate.SpecificPolicy" class="java.lang.String" c:_0="SpecificImpersonationPolicy" />
-    
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/intercept/intercept-events-flow.xml b/test-compose/idp/container_files/config/shib-idp/conf/intercept/intercept-events-flow.xml
deleted file mode 100644
index 6214e80..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/intercept/intercept-events-flow.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<flow xmlns="http://www.springframework.org/schema/webflow"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"
-      abstract="true">
-
-    <!-- ADVANCED USE ONLY -->
-    
-    <!--
-    You can ignore this file unless you are creating your own custom intercept subflows that want to
-    report custom events in response to unusual conditions.
-    -->
-
-    <!-- <end-state id="MyCustomEvent" /> -->
-
-    <global-transitions>
-        <!-- <transition on="MyCustomEvent" to="MyCustomEvent" /> -->
-        <transition on="#{!'proceed'.equals(currentEvent.id)}" to="InvalidEvent" />
-    </global-transitions>
-
-</flow>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/intercept/profile-intercept.xml b/test-compose/idp/container_files/config/shib-idp/conf/intercept/profile-intercept.xml
deleted file mode 100644
index f086cfa..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/intercept/profile-intercept.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <!--
-    Intercept flows are used at various injection points to modify processing. This is the master list
-    of flows available that provide interesting features to deployers, but flows are actually enabled by
-    specifying them in various profile configuration beans via relying-party.xml 
-    
-    This list of flows is merged with a built-in set defined in a system configuration file, and may be
-    empty, but should not be removed. You must add your own custom flows to this list if you create any.
-    -->
-    
-    <bean id="shibboleth.AvailableInterceptFlows" parent="shibboleth.DefaultInterceptFlows" lazy-init="true">
-        <property name="sourceList">
-            <list merge="true">
-                <bean id="intercept/context-check" parent="shibboleth.InterceptFlow" />
-                
-                <bean id="intercept/expiring-password" parent="shibboleth.InterceptFlow" />
-        
-                <bean id="intercept/terms-of-use" parent="shibboleth.consent.TermsOfUseFlow" />
-        
-                <bean id="intercept/attribute-release" parent="shibboleth.consent.AttributeReleaseFlow" />
-                
-                <bean id="intercept/impersonate" parent="shibboleth.InterceptFlow" />
-                
-                <bean id="intercept/external" parent="shibboleth.InterceptFlow" />
-            </list>
-        </property>
-    </bean>
-
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/logback.xml.dist b/test-compose/idp/container_files/config/shib-idp/conf/logback.xml.dist
deleted file mode 100644
index ac19b1f..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/logback.xml.dist
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-
-    <!--
-    Variables for simplifying logging configuration.
-    http://logback.qos.ch/manual/configuration.html#variableSubstitution
-    -->
-
-    <!--
-    If you want to use custom properties in this config file,
-    we load the main property file for you.
-    -->
-    <variable file="${idp.home}/conf/idp.properties" />
-
-    <!-- Location and retention. -->
-    
-    <variable name="idp.logfiles" value="${idp.home}/logs" />
-    <variable name="idp.loghistory" value="${idp.loghistory:-180}" />
-    
-    <!-- Much higher performance if you operate on DEBUG. -->
-    <!-- <variable name="idp.process.appender" value="ASYNC_PROCESS" /> -->
-    
-    <!-- Logging level shortcuts. -->
-    <variable name="idp.loglevel.idp" value="${idp.loglevel.idp:-INFO}" />
-    <variable name="idp.loglevel.ldap" value="${idp.loglevel.ldap:-WARN}" />
-    <variable name="idp.loglevel.messages" value="${idp.loglevel.messages:-INFO}" />
-    <variable name="idp.loglevel.encryption" value="${idp.loglevel.encryption:-INFO}" />
-    <variable name="idp.loglevel.opensaml" value="${idp.loglevel.opensaml:-INFO}" />
-    <variable name="idp.loglevel.props" value="${idp.loglevel.props:-INFO}" />
-    <variable name="idp.loglevel.httpclient" value="${idp.loglevel.httpclient:-INFO}" />
-    
-    <!-- Don't turn these up unless you want a *lot* of noise. -->
-    <variable name="idp.loglevel.spring" value="${idp.loglevel.spring:-ERROR}" />
-    <variable name="idp.loglevel.container" value="${idp.loglevel.container:-ERROR}" />
-    <variable name="idp.loglevel.xmlsec" value="${idp.loglevel.xmlsec:-INFO}" />
-
-    <!-- =========================================================== -->
-    <!-- ============== Logging Categories and Levels ============== -->
-    <!-- =========================================================== -->
-
-    <!-- Logs IdP, but not OpenSAML, messages -->
-    <logger name="net.shibboleth.idp" level="${idp.loglevel.idp}"/>
-
-    <!-- Logs OpenSAML, but not IdP, messages -->
-    <logger name="org.opensaml.saml" level="${idp.loglevel.opensaml}"/>
-    
-    <!-- Logs LDAP related messages -->
-    <logger name="org.ldaptive" level="${idp.loglevel.ldap}"/>
-
-    <!-- Logs embedded HTTP client messages -->
-    <logger name="org.apache.http" level="${idp.loglevel.httpclient}"/>
-    
-    <!-- Logs inbound and outbound protocols messages at DEBUG level -->
-    <logger name="PROTOCOL_MESSAGE" level="${idp.loglevel.messages}" />
-
-    <!-- Logs unencrypted SAML at DEBUG level -->
-    <logger name="org.opensaml.saml.saml2.encryption.Encrypter" level="${idp.loglevel.encryption}" />
-
-    <!-- Logs system properties during startup at DEBUG level -->
-    <logger name="net.shibboleth.idp.log.LogbackLoggingService" level="${idp.loglevel.props}" />
-
-    <!-- Especially chatty. -->
-    <logger name="org.apache.xml.security" level="${idp.loglevel.xmlsec}" />
-    <logger name="org.springframework" level="${idp.loglevel.spring}"/>
-    <logger name="org.apache.catalina" level="${idp.loglevel.container}"/>
-    <logger name="org.eclipse.jetty" level="${idp.loglevel.container}"/>
-
-
-    <!-- =========================================================== -->
-    <!-- ============== Low Level Details or Changes =============== -->
-    <!-- =========================================================== -->
-    
-    <!-- Process log. -->
-    <appender name="IDP_PROCESS" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>${idp.logfiles}/idp-process.log</File>
-        
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${idp.logfiles}/idp-process-%d{yyyy-MM-dd}.log.gz</fileNamePattern>
-            <maxHistory>${idp.loghistory}</maxHistory>
-        </rollingPolicy>
-
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <charset>UTF-8</charset>
-            <Pattern>%date{ISO8601} - %mdc{idp.remote_addr} - %level [%logger:%line] - %msg%n%ex{full}</Pattern>
-        </encoder>
-
-        <!-- Ignore Velocity status page error. -->
-        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-            <evaluator>
-                <matcher>
-                    <Name>VelocityStatusMatcher</Name>
-                    <regex>ResourceManager : unable to find resource 'status.vm' in any resource loader.</regex>
-                </matcher>
-                <expression>VelocityStatusMatcher.matches(formattedMessage)</expression>
-            </evaluator>
-            <OnMatch>DENY</OnMatch>
-        </filter>
-    </appender>
-
-    <appender name="ASYNC_PROCESS" class="ch.qos.logback.classic.AsyncAppender">
-        <appender-ref ref="IDP_PROCESS" />
-        <discardingThreshold>0</discardingThreshold>
-    </appender>
-
-    <appender name="IDP_WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- Suppress anything below WARN. -->
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>WARN</level>
-        </filter>
-        
-        <File>${idp.logfiles}/idp-warn.log</File>
-        
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${idp.logfiles}/idp-warn-%d{yyyy-MM-dd}.log.gz</fileNamePattern>
-            <maxHistory>${idp.loghistory}</maxHistory>
-        </rollingPolicy>
-        
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <charset>UTF-8</charset>
-            <Pattern>%date{ISO8601} - %mdc{idp.remote_addr} - %level [%logger:%line] - %msg%n%ex{short}</Pattern>
-        </encoder>
-        
-        <!-- Ignore Velocity status page error. -->
-        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-            <evaluator>
-                <matcher>
-                    <Name>VelocityStatusMatcher</Name>
-                    <regex>ResourceManager : unable to find resource 'status.vm' in any resource loader.</regex>
-                </matcher>
-                <expression>VelocityStatusMatcher.matches(formattedMessage)</expression>
-            </evaluator>
-            <OnMatch>DENY</OnMatch>
-        </filter>
-    </appender>
-    
-    <!-- Audit log. -->
-    <appender name="IDP_AUDIT" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>${idp.logfiles}/idp-audit.log</File>
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${idp.logfiles}/idp-audit-%d{yyyy-MM-dd}.log.gz</fileNamePattern>
-            <maxHistory>${idp.loghistory}</maxHistory>
-        </rollingPolicy>
-
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <charset>UTF-8</charset>
-            <Pattern>%msg%n</Pattern>
-        </encoder>
-    </appender>
-    
-    <!-- Consent audit log. -->
-    <appender name="IDP_CONSENT_AUDIT" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>${idp.logfiles}/idp-consent-audit.log</File>
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${idp.logfiles}/idp-consent-audit-%d{yyyy-MM-dd}.log.gz</fileNamePattern>
-            <maxHistory>${idp.loghistory}</maxHistory>
-        </rollingPolicy>
-
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <charset>UTF-8</charset>
-            <Pattern>%msg%n</Pattern>
-        </encoder>
-    </appender>
-
-    <!-- F-TICKS syslog destination. -->
-    <appender name="IDP_FTICKS" class="ch.qos.logback.classic.net.SyslogAppender">
-        <syslogHost>${idp.fticks.loghost:-localhost}</syslogHost>
-        <port>${idp.fticks.logport:-514}</port>
-        <facility>AUTH</facility>
-        <suffixPattern>[%thread] %logger %msg</suffixPattern>
-    </appender>
-
-    <logger name="Shibboleth-Audit" level="ALL">
-        <appender-ref ref="${idp.audit.appender:-IDP_AUDIT}"/>
-    </logger>
-
-    <logger name="Shibboleth-FTICKS" level="ALL" additivity="false">
-        <appender-ref ref="${idp.fticks.appender:-IDP_FTICKS}"/>
-    </logger>
-
-    <logger name="Shibboleth-Consent-Audit" level="ALL">
-        <appender-ref ref="${idp.consent.appender:-IDP_CONSENT_AUDIT}"/>
-    </logger>
-    
-    <root level="${idp.loglevel.root:-INFO}">
-        <appender-ref ref="${idp.process.appender:-IDP_PROCESS}"/>
-        <appender-ref ref="${idp.warn.appender:-IDP_WARN}" />
-    </root>
-
-</configuration>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/logback.xml.tmp3 b/test-compose/idp/container_files/config/shib-idp/conf/logback.xml.tmp3
deleted file mode 100644
index 4eebeaa..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/logback.xml.tmp3
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-
-    <!--
-    Variables for simplifying logging configuration.
-    http://logback.qos.ch/manual/configuration.html#variableSubstitution
-    -->
-
-    <!--
-    If you want to use custom properties in this config file,
-    we load the main property file for you.
-    -->
-    <variable file="${idp.home}/conf/idp.properties" />
-
-    <!-- Location and retention. -->
-    
-    <variable name="idp.logfiles" value="${idp.home}/logs" />
-    <variable name="idp.loghistory" value="${idp.loghistory:-180}" />
-    
-    <!-- Much higher performance if you operate on DEBUG. -->
-    <!-- <variable name="idp.process.appender" value="ASYNC_PROCESS" /> -->
-    
-    <!-- Logging level shortcuts. -->
-    <variable name="idp.loglevel.idp" value="${idp.loglevel.idp:-INFO}" />
-    <variable name="idp.loglevel.ldap" value="${idp.loglevel.ldap:-WARN}" />
-    <variable name="idp.loglevel.messages" value="${idp.loglevel.messages:-INFO}" />
-    <variable name="idp.loglevel.encryption" value="${idp.loglevel.encryption:-INFO}" />
-    <variable name="idp.loglevel.opensaml" value="${idp.loglevel.opensaml:-INFO}" />
-    <variable name="idp.loglevel.props" value="${idp.loglevel.props:-INFO}" />
-    <variable name="idp.loglevel.httpclient" value="${idp.loglevel.httpclient:-INFO}" />
-    
-    <!-- Don't turn these up unless you want a *lot* of noise. -->
-    <variable name="idp.loglevel.spring" value="${idp.loglevel.spring:-ERROR}" />
-    <variable name="idp.loglevel.container" value="${idp.loglevel.container:-ERROR}" />
-    <variable name="idp.loglevel.xmlsec" value="${idp.loglevel.xmlsec:-INFO}" />
-
-    <!-- =========================================================== -->
-    <!-- ============== Logging Categories and Levels ============== -->
-    <!-- =========================================================== -->
-
-    <!-- Logs IdP, but not OpenSAML, messages -->
-    <logger name="net.shibboleth.idp" level="${idp.loglevel.idp}"/>
-
-    <!-- Logs OpenSAML, but not IdP, messages -->
-    <logger name="org.opensaml.saml" level="${idp.loglevel.opensaml}"/>
-    
-    <!-- Logs LDAP related messages -->
-    <logger name="org.ldaptive" level="${idp.loglevel.ldap}"/>
-
-    <!-- Logs embedded HTTP client messages -->
-    <logger name="org.apache.http" level="${idp.loglevel.httpclient}"/>
-    
-    <!-- Logs inbound and outbound protocols messages at DEBUG level -->
-    <logger name="PROTOCOL_MESSAGE" level="${idp.loglevel.messages}" />
-
-    <!-- Logs unencrypted SAML at DEBUG level -->
-    <logger name="org.opensaml.saml.saml2.encryption.Encrypter" level="${idp.loglevel.encryption}" />
-
-    <!-- Logs system properties during startup at DEBUG level -->
-    <logger name="net.shibboleth.idp.log.LogbackLoggingService" level="${idp.loglevel.props}" />
-
-    <!-- Especially chatty. -->
-    <logger name="org.apache.xml.security" level="${idp.loglevel.xmlsec}" />
-    <logger name="org.springframework" level="${idp.loglevel.spring}"/>
-    <logger name="org.apache.catalina" level="${idp.loglevel.container}"/>
-    <logger name="org.eclipse.jetty" level="${idp.loglevel.container}"/>
-
-
-    <!-- =========================================================== -->
-    <!-- ============== Low Level Details or Changes =============== -->
-    <!-- =========================================================== -->
-    
-    <!-- Process log. -->
-    <appender name="IDP_PROCESS" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>/tmp/logidp-process</File>
-        
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${idp.logfiles}/idp-process-%d{yyyy-MM-dd}.log.gz</fileNamePattern>
-            <maxHistory>${idp.loghistory}</maxHistory>
-        </rollingPolicy>
-
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <charset>UTF-8</charset>
-            <Pattern>%date{ISO8601} - %mdc{idp.remote_addr} - %level [%logger:%line] - %msg%n%ex{full}</Pattern>
-        </encoder>
-
-        <!-- Ignore Velocity status page error. -->
-        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-            <evaluator>
-                <matcher>
-                    <Name>VelocityStatusMatcher</Name>
-                    <regex>ResourceManager : unable to find resource 'status.vm' in any resource loader.</regex>
-                </matcher>
-                <expression>VelocityStatusMatcher.matches(formattedMessage)</expression>
-            </evaluator>
-            <OnMatch>DENY</OnMatch>
-        </filter>
-    </appender>
-
-    <appender name="ASYNC_PROCESS" class="ch.qos.logback.classic.AsyncAppender">
-        <appender-ref ref="IDP_PROCESS" />
-        <discardingThreshold>0</discardingThreshold>
-    </appender>
-
-    <appender name="IDP_WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- Suppress anything below WARN. -->
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>WARN</level>
-        </filter>
-        
-        <File>/tmp/logidp-warn</File>
-        
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${idp.logfiles}/idp-warn-%d{yyyy-MM-dd}.log.gz</fileNamePattern>
-            <maxHistory>${idp.loghistory}</maxHistory>
-        </rollingPolicy>
-        
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <charset>UTF-8</charset>
-            <Pattern>%date{ISO8601} - %mdc{idp.remote_addr} - %level [%logger:%line] - %msg%n%ex{short}</Pattern>
-        </encoder>
-        
-        <!-- Ignore Velocity status page error. -->
-        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-            <evaluator>
-                <matcher>
-                    <Name>VelocityStatusMatcher</Name>
-                    <regex>ResourceManager : unable to find resource 'status.vm' in any resource loader.</regex>
-                </matcher>
-                <expression>VelocityStatusMatcher.matches(formattedMessage)</expression>
-            </evaluator>
-            <OnMatch>DENY</OnMatch>
-        </filter>
-    </appender>
-    
-    <!-- Audit log. -->
-    <appender name="IDP_AUDIT" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>/tmp/logidp-audit</File>
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${idp.logfiles}/idp-audit-%d{yyyy-MM-dd}.log.gz</fileNamePattern>
-            <maxHistory>${idp.loghistory}</maxHistory>
-        </rollingPolicy>
-
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <charset>UTF-8</charset>
-            <Pattern>%msg%n</Pattern>
-        </encoder>
-    </appender>
-    
-    <!-- Consent audit log. -->
-    <appender name="IDP_CONSENT_AUDIT" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>${idp.logfiles}/idp-consent-audit.log</File>
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${idp.logfiles}/idp-consent-audit-%d{yyyy-MM-dd}.log.gz</fileNamePattern>
-            <maxHistory>${idp.loghistory}</maxHistory>
-        </rollingPolicy>
-
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <charset>UTF-8</charset>
-            <Pattern>%msg%n</Pattern>
-        </encoder>
-    </appender>
-
-    <!-- F-TICKS syslog destination. -->
-    <appender name="IDP_FTICKS" class="ch.qos.logback.classic.net.SyslogAppender">
-        <syslogHost>${idp.fticks.loghost:-localhost}</syslogHost>
-        <port>${idp.fticks.logport:-514}</port>
-        <facility>AUTH</facility>
-        <suffixPattern>[%thread] %logger %msg</suffixPattern>
-    </appender>
-
-    <logger name="Shibboleth-Audit" level="ALL">
-        <appender-ref ref="${idp.audit.appender:-IDP_AUDIT}"/>
-    </logger>
-
-    <logger name="Shibboleth-FTICKS" level="ALL" additivity="false">
-        <appender-ref ref="${idp.fticks.appender:-IDP_FTICKS}"/>
-    </logger>
-
-    <logger name="Shibboleth-Consent-Audit" level="ALL">
-        <appender-ref ref="${idp.consent.appender:-IDP_CONSENT_AUDIT}"/>
-    </logger>
-    
-    <root level="${idp.loglevel.root:-INFO}">
-        <appender-ref ref="${idp.process.appender:-IDP_PROCESS}"/>
-        <appender-ref ref="${idp.warn.appender:-IDP_WARN}" />
-    </root>
-
-</configuration>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/saml-nameid.properties b/test-compose/idp/container_files/config/shib-idp/conf/saml-nameid.properties
deleted file mode 100644
index 7169c5e..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/saml-nameid.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-# Properties involving SAML NameIdentifier/NameID generation/consumption
-
-# For the most part these settings only deal with "transient" and "persistent"
-# identifiers. See saml-nameid.xml and c14n/subject-c14n.xml for advanced
-# settings
-
-# Default NameID Formats to use when nothing else is called for.
-# Don't change these just to change the Format used for a single SP!
-#idp.nameid.saml2.default = urn:oasis:names:tc:SAML:2.0:nameid-format:transient
-#idp.nameid.saml1.default = urn:mace:shibboleth:1.0:nameIdentifier
-
-# Set to shibboleth.StoredTransientIdGenerator for server-side transient ID storage
-#idp.transientId.generator = shibboleth.CryptoTransientIdGenerator
-
-# Persistent IDs can be computed on the fly with a hash, or managed in a database
-
-# For computed IDs, set a source attribute, and a secret salt in secrets.properties
-#idp.persistentId.sourceAttribute = changethistosomethingreal
-#idp.persistentId.useUnfilteredAttributes = true
-#idp.persistentId.algorithm = SHA
-# BASE64 will match V2 values, we recommend BASE32 encoding for new installs.
-idp.persistentId.encoding = BASE32
-
-# To use a database, use shibboleth.StoredPersistentIdGenerator
-#idp.persistentId.generator = shibboleth.ComputedPersistentIdGenerator
-# For basic use, set this to a JDBC DataSource bean name:
-#idp.persistentId.dataSource = PersistentIdDataSource
-# For advanced use, set to a bean inherited from shibboleth.JDBCPersistentIdStore
-#idp.persistentId.store = MyPersistentIdStore
-# Set to an empty property to skip hash-based generation of first stored ID
-#idp.persistentId.computed = shibboleth.ComputedPersistentIdGenerator
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/saml-nameid.xml b/test-compose/idp/container_files/config/shib-idp/conf/saml-nameid.xml
deleted file mode 100644
index 7d82cf5..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/saml-nameid.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <!-- ========================= SAML NameID Generation ========================= -->
-
-    <!--
-    These generator lists handle NameID/Nameidentifier generation going forward. By default,
-    transient IDs for both SAML versions are enabled. The commented examples are for persistent IDs
-    and generating more one-off formats based on resolved attributes. The suggested approach is to
-    control their use via release of the underlying source attribute in the filter policy rather
-    than here, but you can set a property on any generator called "activationCondition" to limit
-    use in the most generic way.
-    
-    Most of the relevant configuration settings are controlled using properties; an exception is
-    the generation of arbitrary/custom formats based on attribute information, examples of which
-    are shown below.
-    
-    -->
-    
-    <!-- SAML 2 NameID Generation -->
-    <util:list id="shibboleth.SAML2NameIDGenerators">
-    
-        <ref bean="shibboleth.SAML2TransientGenerator" />
-        
-        <!-- Uncommenting this bean requires configuration in saml-nameid.properties. -->
-        <!--
-        <ref bean="shibboleth.SAML2PersistentGenerator" />
-        -->
-
-        <!--
-        <bean parent="shibboleth.SAML2AttributeSourcedGenerator"
-            p:omitQualifiers="true"
-            p:format="urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
-            p:attributeSourceIds="#{ {'mail'} }" />
-        -->
-                
-    </util:list>
-
-    <!-- SAML 1 NameIdentifier Generation -->
-    <util:list id="shibboleth.SAML1NameIdentifierGenerators">
-
-        <ref bean="shibboleth.SAML1TransientGenerator" />
-
-        <!--
-        <bean parent="shibboleth.SAML1AttributeSourcedGenerator"
-            p:omitQualifiers="true"
-            p:format="urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
-            p:attributeSourceIds="#{ {'mail'} }" />
-        -->
-                
-    </util:list>
-    
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/services.properties b/test-compose/idp/container_files/config/shib-idp/conf/services.properties
deleted file mode 100644
index 9dc3dff..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/services.properties
+++ /dev/null
@@ -1,79 +0,0 @@
-# Configure the resources to load for various services,
-# and the settings for failure handling and auto-reload.
-
-# failFast=true prevents IdP startup if a configuration is bad
-# checkInterval = PT0S means never reload (this is the default)
-
-# Global default for fail-fast behavior of most subsystems
-# with individual override possible below.
-#idp.service.failFast = false
-
-#idp.service.logging.resource = %{idp.home}/conf/logback.xml
-#idp.service.logging.failFast = true
-idp.service.logging.checkInterval = PT5M
-
-#idp.service.relyingparty.resources = shibboleth.RelyingPartyResolverResources
-#idp.service.relyingparty.failFast = false
-idp.service.relyingparty.checkInterval = PT15M
-# Set true to limit metadata-driven settings lookup to decoded EntityAttributes
-idp.service.relyingparty.ignoreUnmappedEntityAttributes=true
-
-#idp.service.metadata.resources = shibboleth.MetadataResolverResources
-#idp.service.metadata.failFast = false
-#idp.service.metadata.checkInterval = PT0S
-# Set to false if not using ByReference MetadataFilters for a small perf gain
-#idp.service.metadata.enableByReferenceFilters = true
-
-#idp.service.attribute.registry.resources = shibboleth.AttributeRegistryResources
-#idp.service.attribute.registry.namingRegistry = shibboleth.DefaultNamingRegistry
-#idp.service.attribute.registry.failFast = false
-idp.service.attribute.registry.checkInterval = PT15M
-# Default control of whether to encode XML attribute data with xsi:type
-idp.service.attribute.registry.encodeType = false
-
-#idp.service.attribute.resolver.resources = shibboleth.AttributeResolverResources
-#idp.service.attribute.resolver.failFast = false
-idp.service.attribute.resolver.checkInterval = PT15M
-#idp.service.attribute.resolver.maskFailures = true
-#idp.service.attribute.resolver.stripNulls = false
-
-#idp.service.attribute.filter.resources = shibboleth.AttributeFilterResources
-# NOTE: Failing the filter fast leaves no filters enabled.
-#idp.service.attribute.filter.failFast = false
-idp.service.attribute.filter.checkInterval = PT15M
-#idp.service.attribute.filter.maskFailures = true
-
-#idp.service.nameidGeneration.resources = shibboleth.NameIdentifierGenerationResources
-#idp.service.nameidGeneration.failFast = false
-idp.service.nameidGeneration.checkInterval = PT15M
-
-#idp.service.access.resources = shibboleth.AccessControlResources
-#idp.service.access.failFast = true
-idp.service.access.checkInterval = PT5M
-
-#idp.service.cas.registry.resources = shibboleth.CASServiceRegistryResources
-#idp.service.cas.registry.failFast = false
-idp.service.cas.registry.checkInterval = PT15M
-
-#idp.service.managedBean.resources = shibboleth.ManagedBeanResources
-#idp.service.managedBean.failFast = false
-idp.service.managedBean.checkInterval = PT15M
-
-#idp.message.resources = shibboleth.MessageSourceResources
-#idp.message.cacheSeconds = 300
-
-# Parameters for pre-defined HttpClient instances which perform in-memory and filesystem caching.
-# These are used with components such as remote configuration resources that are explicitly wired
-# with these client instances, *not* by default with HTTP metadata resolvers.
-#idp.httpclient.useSecurityEnhancedTLSSocketFactory = false
-#idp.httpclient.connectionDisregardTLSCertificate = false
-#idp.httpclient.connectionRequestTimeout = PT1M
-#idp.httpclient.connectionTimeout = PT1M
-#idp.httpclient.socketTimeout = PT1M
-#idp.httpclient.maxConnectionsTotal = 100
-#idp.httpclient.maxConnectionsPerRoute = 100
-#idp.httpclient.memorycaching.maxCacheEntries = 50
-#idp.httpclient.memorycaching.maxCacheEntrySize = 1048576
-#idp.httpclient.filecaching.maxCacheEntries = 100
-#idp.httpclient.filecaching.maxCacheEntrySize = 10485760
-idp.httpclient.filecaching.cacheDirectory = %{idp.home}/tmp/httpClientCache
\ No newline at end of file
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/services.xml b/test-compose/idp/container_files/config/shib-idp/conf/services.xml
deleted file mode 100644
index 5a4cdea..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/services.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
-    xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-    default-init-method="initialize"
-    default-destroy-method="destroy">
-                               
-    <!-- Advanced configuration of services from HTTP.
-    
-      To use an HTTP resource you first need to configure the Apache HttpClient which will be used
-      to communicate with the web server.  Any HttpClient can be used, but two Factory Beans allow simple
-      configuration of in-memory or file-based caching clients.
-      
-      Examples are:
-      
-        A resource which will be supplied from an in-memory cache for as long as the file on the webserver does not change.  
-        If the webserver becomes unavailable the resource will be unavailable.
-         
-        <bean id="inMemoryResource" class="net.shibboleth.ext.spring.resource.HTTPResource"
-              c:client-ref="shibboleth.MemoryCachingHttpClient" 
-              c:url="http://example.org/path/to/file.xml" />
-              
-        Two resources which will be supplied from an on disk cache (suitable for multiple or large files) for as long 
-        as the file on the webserver does not change.  If the webserver becomes unavailable the last used contents
-        of the file will be returned (even if that was in a previous IdP lifetime).
-        
-        <bean id="fileResource" class="net.shibboleth.ext.spring.resource.FileBackedHTTPResource"
-              c:client-ref="shibboleth.FileCachingHttpClient" 
-              c:url="http://example.org/path/to/file.xml"
-              c:backingFile="/var/shibboleth/caches/resourcecache/file.xml"/>
-       
-        <bean id="otherFileResource" class="net.shibboleth.ext.spring.resource.FileBackedHTTPResource"
-              c:client-ref="shibboleth.FileCachingHttpClient" 
-              c:url="http://another.server.example.org/path/to/different/file.xml"
-              c:backingFile="/var/shibboleth/caches/resourcecache/differentFile.xml"/>
-              
-        In all cases you should review the "idp.httpclient.*" properties defined in services.properties
-    -->
-    
-    <!--
-    Otherwise by default we look at resources whose names are derived from %{idp.home}. Services not configured
-    using native Spring syntax also need to load the property-placeholder file in order to pull settings from
-    property sources.
-    -->
-
-    <!-- This set of resources supports a native Spring relying-party.xml file. -->
-    <util:list id="shibboleth.RelyingPartyResolverResources">
-        <value>%{idp.home}/conf/relying-party.xml</value>
-        <value>%{idp.home}/conf/credentials.xml</value>
-        <value>%{idp.home}/system/conf/relying-party-system.xml</value>
-    </util:list>
-
-    <util:list id="shibboleth.MetadataResolverResources">
-        <value>%{idp.home}/conf/metadata-providers.xml</value>
-        <value>%{idp.home}/system/conf/metadata-providers-system.xml</value>
-    </util:list>
-
-    <util:list id ="shibboleth.AttributeResolverResources">
-        <value>%{idp.home}/conf/attribute-resolver.xml</value>
-    </util:list>
-
-    <util:list id ="shibboleth.AttributeRegistryResources">
-        <value>%{idp.home}/conf/attribute-registry.xml</value>
-        <value>%{idp.home}/system/conf/attribute-registry-system.xml</value>
-        <value>%{idp.home}/conf/attributes/default-rules.xml</value>
-        <value>%{idp.home}/conf/attribute-resolver.xml</value>
-    </util:list>
-
-    <util:list id ="shibboleth.AttributeFilterResources">
-        <value>%{idp.home}/conf/attribute-filter.xml</value>
-    </util:list>
-
-    <util:list id ="shibboleth.NameIdentifierGenerationResources">
-        <value>%{idp.home}/conf/saml-nameid.xml</value>
-        <value>%{idp.home}/system/conf/saml-nameid-system.xml</value>
-    </util:list>
-    
-    <util:list id="shibboleth.AccessControlResources">
-        <value>%{idp.home}/conf/access-control.xml</value>
-        <value>%{idp.home}/system/conf/access-control-system.xml</value>
-    </util:list>
-
-    <util:list id="shibboleth.CASServiceRegistryResources">
-        <value>%{idp.home}/conf/cas-protocol.xml</value>
-    </util:list>
-
-    <!--
-    This collection of resources differs slightly in that it should not include the file extension.
-    Message sources are internationalized, and Spring will search for a compatible language extension
-    and fall back to one with only a .properties extension.
-    -->
-    <util:list id="shibboleth.MessageSourceResources">
-        <value>%{idp.home}/messages/messages</value>
-        <value>%{idp.home}/system/messages/messages</value>
-    </util:list>
-    
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/conf/session-manager.xml b/test-compose/idp/container_files/config/shib-idp/conf/session-manager.xml
deleted file mode 100644
index 7372029..0000000
--- a/test-compose/idp/container_files/config/shib-idp/conf/session-manager.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
-    xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
-    default-init-method="initialize"
-    default-destroy-method="destroy">
-
-    <!-- Flows that propagate logout to additional services using supported protocols. -->
-    <util:list id="shibboleth.LogoutPropagationFlows">
-        <ref bean="logoutprop/cas" />
-        <ref bean="logoutprop/saml2" />
-    </util:list>
-        
-    <!--
-    List of client-side storage service plugins. If you use server-side storage and don't need these
-    services, you can remove or comment out the <ref> elements, but don't remove the list bean or
-    a default list will be substituted for backward compatibility.
-    -->
-    <util:list id="shibboleth.ClientStorageServices">
-        <ref bean="shibboleth.ClientSessionStorageService" />
-        <ref bean="shibboleth.ClientPersistentStorageService" />
-    </util:list>
-    
-</beans>
diff --git a/test-compose/idp/container_files/config/shib-idp/edit-webapp/css/consent.css b/test-compose/idp/container_files/config/shib-idp/edit-webapp/css/consent.css
deleted file mode 100644
index 5daabee..0000000
--- a/test-compose/idp/container_files/config/shib-idp/edit-webapp/css/consent.css
+++ /dev/null
@@ -1,150 +0,0 @@
-.box {
-    width:600px;
-    margin-left: auto;
-    margin-right: auto;
-    margin-top: 50px;
-    background-color: white;
-   -webkit-box-shadow: 1px 1px 15px #999999;
-    -moz-box-shadow: 1px 1px 15px #999999;
-    box-shadow: 1px 1px 15px #999999;
-    -webkit-border-radius: 8px;
-    -moz-border-radius: 8px;
-    border-radius: 8px;
-    overflow: auto;
-    padding: 1.268em;
-}
-
-body {
-    font-family:Verdana, Geneva, sans-serif;
-    font-size: 12px;
-}
-
-h1 {
-    font-size: 13px;
-    padding-bottom: 12px;
-}
-
-a {
-    color: #00247D;
-    text-decoration: underline;
-}
-
-a:visited {
-    color: #00247D;
-    text-decoration: underline;
-}
-
-a:focus, a:hover, a:active {
-    color: #F39800;
-    text-decoration: underline;
-}
-
-#tou-content {
-    font-family:monospace;
-    width: 95%;
-    border: solid 1px #666;
-    margin: 4px;
-    padding: 10px;
-    overflow: hidden;
-}
-
-#tou-content li{
-    margin-bottom:10px;
-}
-
-#tou-acceptance {
-    width: 95%;
-    border: solid 1px #666;
-    background-color: #F0F0F0;
-    margin: 4px;
-    padding: 10px;
-    text-align: left;
-    overflow: hidden;
-}
-
-.service_name {
-    font-weight: bold;
-}
-
-.service_description {
-    font-style: italic;
-}
-
-.organization_name {
-}
-
-#attributeRelease-consent {
-    width: 95%;
-    border: solid 1px #666;
-    background-color: #F0F0F0;
-    margin: 4px;
-    overflow: hidden;
-}
-
-#attributeRelease {
-    width: 95%;
-    margin: 4px;
-    border: solid 1px black;
-    overflow: auto;
-}
-
-#attributeRelease table {
-    border-collapse: collapse;
-    border: none 0px white;
-    width: 100%;
-}
-
-#attributeRelease td {
-    padding: 3px 7px;
-    vertical-align: top;
-}
-
-#attributeRelease th  {
-    text-align: left;
-    font-size: 18px;
-    padding: 5px 7px;
-    background-color:#00247D;
-    color: white;
-}
-
-#attributeRelease tr:nth-of-type(even) {
-    background-color: #E4E5E3;
-}
-
-.federation_logo
-{
-	width: 50%;
-    float: left;
-    padding-top: 35px;
-    border: 0;
-}
-.organization_logo
-{
-	width: 50%;
-    float: right;
-    border: 0;
-}
-
-.form-error {
-  padding: 0;
-  color: #B61601;
-}
-
-/* Device specific styles */
-@media only screen and (max-device-width: 721px){
-  .box {
-      width: auto;
-      box-shadow: none;
-      border-radius: 0;
-      -webkit-box-shadow: none;
-      -webkit-border-radius: 0;
-      -moz-box-shadow: none;
-      -moz-border-radius: 0;
-      padding: 0;
-      margin-top:0;
-  }
-  #tou-content, #tou-acceptance{
-    /*width:87%;*/
-    width:auto;
-  }
-}
diff --git a/test-compose/idp/container_files/config/shib-idp/edit-webapp/css/logout.css b/test-compose/idp/container_files/config/shib-idp/edit-webapp/css/logout.css
deleted file mode 100644
index dcd10d2..0000000
--- a/test-compose/idp/container_files/config/shib-idp/edit-webapp/css/logout.css
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Success/Failure indicators for logout propagation. */
-li.logout {
-    line-height: 36px;
-    padding-left: 36px;
-}
-li.logout.success {
-    background: url(../images/success-32x32.png) no-repeat left center;
-}
-li.logout.failure {
-    background: url(../images/failure-32x32.png) no-repeat left center;
-}
-li.logout.pending{
-
-}
-li.logout.na {
-    background: url(../images/failure-32x32.png) no-repeat left center;
-}
diff --git a/test-compose/idp/container_files/config/shib-idp/edit-webapp/css/main.css b/test-compose/idp/container_files/config/shib-idp/edit-webapp/css/main.css
deleted file mode 100644
index 116b31e..0000000
--- a/test-compose/idp/container_files/config/shib-idp/edit-webapp/css/main.css
+++ /dev/null
@@ -1,165 +0,0 @@
-* {
-    margin: 0;
-    padding: 0;
-}
-header, footer, section, nav {
-    display: block;
-}
-html, body {
-    height: 100%;
-}
-body {
-    font-family:Verdana, Geneva, sans-serif;
-    font-size: 12px;
-    line-height: 1.5;
-    color: #717171;
-    background: #717171;
-}
-a:link,
-a:visited {
-    text-decoration: none;
-    color: #717171;
-}
-img {
-    max-width: 100%;
-    margin-bottom: 12px;
-}
-
-.wrapper {
-    background: #ffffff;
-}
-
-.container {
-    position: relative;
-    left: 34%;
-    width: 540px;
-    margin-left: -270px;
-}
-.container-footer {
-    padding-top: 12px;
-}
-@media only screen and (max-width: 1020px) {
-    .container {
-        left: 45%;
-    }
-}
-@media only screen and (max-width: 650px) {
-    .container {
-        position: static;
-        margin: 0 auto;
-        width: 280px;
-    }
-}
-
-header {
-    padding: 20px 0;
-}
-
-.logo img {
-    border: none;
-}
-@media only screen and (max-width: 650px) {
-    .logo img {
-        display: none;
-    }
-    .logo {
-        background: url(../images/dummylogo-mobile.png) no-repeat top center;
-        display: block;
-        height: 115px;
-        width: 100px;
-        margin: 0 auto;
-    }
-}
-
-.content {
-    padding-bottom: 80px;
-    overflow: hidden;
-}
-
-.column {
-    float: left;
-}
-.column.one {
-    width: 50%;
-    margin-right: 48px;
-}
-
-form {
-    width: 240px;
-    padding-bottom: 21px;
-}
-form label { /* labels are hidden */
-    font-weight: bold;
-}
-form legend {
-    font-size:1.2em;
-    margin-bottom: 12px;
-}
-.form-element-wrapper {
-    margin-bottom: 12px;
-}
-.form-element {
-    width: 100%;
-    padding: 13px 12px;
-    border: none;
-    font-size: 14px;
-    border-radius: 4px;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-}
-.form-field {
-    color: #B7B7B7;
-    border: 1px solid #B7B7B7;
-}
-.form-field-focus,
-.form-field:focus,
-input[type="text"]:focus {
-    color: #333333;
-    border-color: #333;
-}
-.form-button {
-    background: #B61601;
-    box-sizing: content-box;
-    -moz-box-sizing: content-box;
-    color: #ffffff;
-    cursor: pointer;
-}
-.form-button:hover {
-    background: #FF6400;
-}
-.form-error {
-    padding: 0;
-    color: #B61601;
-}
-
-.list-help {
-    margin-top: 40px; /* offset padding on first anchor */
-    list-style: none;
-}
-.list-help-item a {
-    display: block;
-    padding: 6px 0;
-}
-.item-marker {
-    color: #be0000;
-}
-
-footer {
-    color: #ffffff;
-    font-size: 11px;
-    background: #717171;
-}
-.footer-text {
-    margin-bottom: 12px;
-}
-.footer-links a:link,
-.footer-links a:visited {
-    color: #ffffff;
-    font-weight: bold;
-}
-.footer-links a:after {
-    content: "\00a0\00a0\00a0|\00a0\00a0";
-}
-.footer-links a.last:after {
-    content: "";
-}
diff --git a/test-compose/idp/container_files/config/shib-idp/edit-webapp/images/dummylogo-mobile.png b/test-compose/idp/container_files/config/shib-idp/edit-webapp/images/dummylogo-mobile.png
deleted file mode 100644
index 8ba3c95..0000000
Binary files a/test-compose/idp/container_files/config/shib-idp/edit-webapp/images/dummylogo-mobile.png and /dev/null differ
diff --git a/test-compose/idp/container_files/config/shib-idp/edit-webapp/images/dummylogo.png b/test-compose/idp/container_files/config/shib-idp/edit-webapp/images/dummylogo.png
deleted file mode 100644
index e89ede6..0000000
Binary files a/test-compose/idp/container_files/config/shib-idp/edit-webapp/images/dummylogo.png and /dev/null differ
diff --git a/test-compose/idp/container_files/config/shib-idp/edit-webapp/images/failure-32x32.png b/test-compose/idp/container_files/config/shib-idp/edit-webapp/images/failure-32x32.png
deleted file mode 100644
index 3c48e46..0000000
Binary files a/test-compose/idp/container_files/config/shib-idp/edit-webapp/images/failure-32x32.png and /dev/null differ
diff --git a/test-compose/idp/container_files/config/shib-idp/edit-webapp/images/success-32x32.png b/test-compose/idp/container_files/config/shib-idp/edit-webapp/images/success-32x32.png
deleted file mode 100644
index aa51204..0000000
Binary files a/test-compose/idp/container_files/config/shib-idp/edit-webapp/images/success-32x32.png and /dev/null differ
diff --git a/test-compose/idp/container_files/config/shib-idp/messages/messages.properties b/test-compose/idp/container_files/config/shib-idp/messages/messages.properties
deleted file mode 100644
index 5f94396..0000000
--- a/test-compose/idp/container_files/config/shib-idp/messages/messages.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-# You can define message properties here to override messages defined in
-# system/messages/ or to add your own messages.
diff --git a/test-compose/idp/container_files/config/shib-idp/views/admin/unlock-keys.vm b/test-compose/idp/container_files/config/shib-idp/views/admin/unlock-keys.vm
deleted file mode 100644
index a8228ae..0000000
--- a/test-compose/idp/container_files/config/shib-idp/views/admin/unlock-keys.vm
+++ /dev/null
@@ -1,97 +0,0 @@
-##
-## Velocity Template for Attended Startup Unlock Utility
-##
-## Velocity context will contain the following properties:
-## flowRequestContext - the Spring Web Flow RequestContext
-## request - HttpServletRequest
-## response - HttpServletResponse
-## profileRequestContext
-## environment - Spring Environment object for property resolution
-## custom - arbitrary object injected by deployer
-##
-#set ($title = $springMacroRequestContext.getMessage("idp.title", "Web Login Service"))
-#set ($titleSuffix = $springMacroRequestContext.getMessage("idp.unlock-keys.title", "Attended Restart Key Unlock"))
-#set ($eventId = $profileRequestContext.getSubcontext("org.opensaml.profile.context.EventContext").getEvent())
-#set ($state = $flowRequestContext.getCurrentState().getId())
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width,initial-scale=1.0">
-        <title>$title - $titleSuffix</title>
-        <link rel="stylesheet" type="text/css" href="$request.getContextPath()/css/main.css">
-    </head>
-    
-    <body>
-    <div class="wrapper">
-        <div class="container">
-            <header>
-                <img src="$request.getContextPath()#springMessage("idp.logo")" alt="#springMessageText("idp.logo.alt-text", "logo")">
-                <h3>$title - $titleSuffix</h3>
-            </header>
-        
-            <div class="content">
-            #if ($state == "end")
-                <strong>#springMessageText("idp.unlock-keys.complete", "The system is unlocked and ready for use.")</strong>
-                <p><a href="$request.getContextPath()/profile/SAML2/Unsolicited/SSO?providerId=https://sp.example.org/shibboleth">Validation Link</a></p>
-            #else
-                #if ($eventId == "InvalidMessage")
-                    <p class="form-element form-error">
-                    #springMessageText("idp.unlock-keys.error", "Unlock failed; check log for specific message.")
-                    </p>
-                    <br/><br/>
-                #end
-            
-                <form action="$flowExecutionUrl" method="post">
-                  #parse("csrf/csrf.vm")
-                  
-                  <!--
-                  If you have multiple key strategies defined, you'll need multiple pairs of form fields for
-                  the passwords, labeled in the order they're fed into the shibboleth.unlock-keys.KeyStrategies
-                  bean. If you have none, remove the fields.
-                  -->
-
-                  <div class="form-element-wrapper">
-                    <label for="password">#springMessageText("idp.unlock-keys.keystorePassword", "DataSealer Keystore Password")</label>
-                    <input class="form-element form-field" id="password" name="keystorePassword" type="password" />
-                  </div>
-
-                  <div class="form-element-wrapper">
-                    <label for="password">#springMessageText("idp.unlock-keys.keyPassword", "DataSealer Key Password")</label>
-                    <input class="form-element form-field" id="password" name="keyPassword" type="password" />
-                  </div>
-
-                  <!--
-                  If you have multiple private keys defined, you'll need a form field for each passwords, labeled in the order
-                  they're fed into the shibboleth.unlock-keys.Credentials/PrivateKeys beans. If you have none, remove the fields.
-                  -->
-
-                  <div class="form-element-wrapper">
-                    <label for="password">#springMessageText("idp.unlock-keys.privateKeyPassword", "Private Key Password")</label>
-                    <input class="form-element form-field" id="password" name="privateKeyPassword" type="password" />
-                  </div>
-                  
-                  <div class="form-element-wrapper">
-                    <button class="form-element form-button" type="submit" name="_eventId_proceed"
-                        >#springMessageText("idp.unlock-keys.unlock", "Unlock")</button>
-                  </div>
-
-                  <div class="form-element-wrapper">
-                    <button class="form-element form-button" type="submit" name="_eventId_cancel"
-                        >#springMessageText("idp.unlock-keys.cancel", "Cancel")</button>
-                  </div>
-                  
-                </form>
-            #end
-            </div>
-        </div>
-
-        <footer>
-            <div class="container container-footer">
-                <p class="footer-text">#springMessageText("idp.footer", "Insert your footer text here.")</p>
-            </div>
-        </footer>
-        
-    </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/test-compose/idp/container_files/config/shib-idp/views/client-storage/client-storage-read.vm b/test-compose/idp/container_files/config/shib-idp/views/client-storage/client-storage-read.vm
deleted file mode 100644
index 1993c14..0000000
--- a/test-compose/idp/container_files/config/shib-idp/views/client-storage/client-storage-read.vm
+++ /dev/null
@@ -1,53 +0,0 @@
-##
-## Velocity template to read from local storage.
-##
-## Velocity context will contain the following properties
-## flowExecutionUrl - the form action location
-## flowRequestContext - the Spring Web Flow RequestContext
-## flowExecutionKey - the SWF execution key (this is built into the flowExecutionUrl)
-## profileRequestContext - root of context tree
-## loadContext - context with details about the storage keys to load
-## encoder - HTMLEncoder class
-## request - HttpServletRequest
-## response - HttpServletResponse
-## environment - Spring Environment object for property resolution
-#set ($title = $springMacroRequestContext.getMessage("idp.title", "Web Login Service"))
-#set ($titleSuffix = $springMacroRequestContext.getMessage("idp.client-storage-read.suffix", "Loading Session Information"))
-##
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width,initial-scale=1.0">
-        <title>$title - $titleSuffix</title>
-        <link rel="stylesheet" type="text/css" href="$request.getContextPath()/css/main.css">
-        <script>
-        <!--
-        #include( "client-storage/local-storage-read.js" )
-        // -->
-        </script>
-    </head>
-    <body onload="doLoad()">
-        <div class="wrapper">
-            <div class="container">
-                <header>
-                    <h3>$title - $titleSuffix</h3>
-                </header>
-                <div class="content">
-                $springMacroRequestContext.getMessage("idp.client-storage-read.text", "Loading login session information from the browser...")
-                </div>
-                <noscript>
-                    <div class="content">
-                    $springMacroRequestContext.getMessage("idp.client-storage.no-js", "Since your browser does not support JavaScript, you must press the Continue button once to proceed.")
-                    </div>
-                </noscript>
-                #parse( "client-storage/read.vm" )
-            </div>
-            <footer>
-                <div class="container container-footer">
-                    <p class="footer-text">#springMessageText("idp.footer", "Insert your footer text here.")</p>
-                </div>
-            </footer>
-        </div>
-    </body>
-</html>
diff --git a/test-compose/idp/container_files/config/shib-idp/views/client-storage/client-storage-write.vm b/test-compose/idp/container_files/config/shib-idp/views/client-storage/client-storage-write.vm
deleted file mode 100644
index 4b92d6b..0000000
--- a/test-compose/idp/container_files/config/shib-idp/views/client-storage/client-storage-write.vm
+++ /dev/null
@@ -1,53 +0,0 @@
-##
-## Velocity template to write to local storage.
-##
-## Velocity context will contain the following properties
-## flowExecutionUrl - the form action location
-## flowRequestContext - the Spring Web Flow RequestContext
-## flowExecutionKey - the SWF execution key (this is built into the flowExecutionUrl)
-## profileRequestContext - root of context tree
-## saveContext - context with details about the storage data to save
-## encoder - HTMLEncoder class
-## request - HttpServletRequest
-## response - HttpServletResponse
-## environment - Spring Environment object for property resolution
-#set ($title = $springMacroRequestContext.getMessage("idp.title", "Web Login Service"))
-#set ($titleSuffix = $springMacroRequestContext.getMessage("idp.client-storage-write.suffix", "Saving Session Information..."))
-##
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-    <head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width,initial-scale=1.0">
-        <title>$title - $titleSuffix</title>
-        <link rel="stylesheet" type="text/css" href="$request.getContextPath()/css/main.css">
-        <script>
-        <!--
-        #include( "client-storage/local-storage-write.js" )
-        // -->
-        </script>
-    </head>
-    <body onload="doSave()">
-        <div class="wrapper">
-            <div class="container">
-                <header>
-                    <h3>$title - $titleSuffix</h3>
-                </header>
-                <div class="content">
-                $springMacroRequestContext.getMessage("idp.client-storage-write.text", "Saving login session information to the browser...")
-                </div>
-                <noscript>
-                    <div class="content">
-                    $springMacroRequestContext.getMessage("idp.client-storage.no-js", "Since your browser does not support JavaScript, you must press the Continue button once to proceed.")
-                    </div>
-                </noscript>
-                #parse( "client-storage/write.vm" )
-            </div>
-            <footer>
-                <div class="container container-footer">
-                    <p class="footer-text">#springMessageText("idp.footer", "Insert your footer text here.")</p>
-                </div>
-            </footer>
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/test-compose/idp/container_files/config/shib-idp/views/duo.vm b/test-compose/idp/container_files/config/shib-idp/views/duo.vm
deleted file mode 100644
index d212df7..0000000
--- a/test-compose/idp/container_files/config/shib-idp/views/duo.vm
+++ /dev/null
@@ -1,83 +0,0 @@
-##
-## Velocity Template for Duo login view-state
-##
-## Velocity context will contain the following properties
-## flowExecutionUrl - the form action location
-## flowRequestContext - the Spring Web Flow RequestContext
-## flowExecutionKey - the SWF execution key (this is built into the flowExecutionUrl)
-## profileRequestContext - root of context tree
-## authenticationContext - context with authentication request information
-## rpUIContext - the context with SP UI information from the metadata
-## canonicalUsername - name of user passed to Duo
-## duoHost - API hostname for Duo frame
-## duoRequest - signed Duo request message
-## duoScriptPath - path to Duo JavaScript source
-## encoder - HTMLEncoder class
-## request - HttpServletRequest
-## response - HttpServletResponse
-## environment - Spring Environment object for property resolution
-## custom - arbitrary object injected by deployer
-##
-<!DOCTYPE html>
-<html>
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>#springMessageText("idp.title", "Web Login Service")</title>
-    <link rel="stylesheet" type="text/css" href="$request.getContextPath()/css/main.css">
-    <style>
-      #duo_iframe {
-        width: 100%;
-        min-width: 304px;
-        max-width: 620px;
-        height: 330px;
-      }
-    </style>
-</head>
-<body>
-    <div class="wrapper">
-      <div class="container">
-        <header>
-          <img src="$request.getContextPath()#springMessage("idp.logo")" alt="#springMessageText("idp.logo.alt-text", "logo")">
-        </header>
-
-        <div class="content">
-          <div class="column one">
-          
-            <h3>#springMessageText("idp.login.duoRequired", "Authentication with Duo is required for the requested service.")</h3>
-
-            <noscript>#springMessageText("idp.login.duoNoScript", "The Duo service requires JavaScript.")</noscript>          
-            <script src="$request.getContextPath()$duoScriptPath"></script>
-            <iframe id="duo_iframe"
-                data-host="$duoHost"
-                data-sig-request="$duoRequest"
-                data-post-action="$flowExecutionUrl"
-                frameborder="0"
-            >
-            </iframe>
-            <form id="duo_form" method="post">
-                #parse("csrf/csrf.vm")
-                <input type="hidden" name="_eventId" value="proceed" />
-            </form>
-            
-            <h3 style="text-align: center">
-                <a href="$flowExecutionUrl&_eventId=cancel">#springMessageText("idp.login.duoCancel", "Cancel this Request")</a>
-            </h3>
-          </div>
-          <div class="column two">
-            <ul class="list list-help">
-              <li class="list-help-item"><a href="#springMessageText("idp.url.helpdesk", '#')"><span class="item-marker">&rsaquo;</span> #springMessageText("idp.login.needHelp", "Need Help?")</a></li>
-            </ul>
-          </div>
-        </div>
-      </div>
-
-      <footer>
-        <div class="container container-footer">
-          <p class="footer-text">#springMessageText("idp.footer", "Insert your footer text here.")</p>
-        </div>
-      </footer>
-    </div>
-</body>
-</html>
diff --git a/test-compose/idp/container_files/config/shib-idp/views/error.vm b/test-compose/idp/container_files/config/shib-idp/views/error.vm
deleted file mode 100644
index dcb8e2b..0000000
--- a/test-compose/idp/container_files/config/shib-idp/views/error.vm
+++ /dev/null
@@ -1,73 +0,0 @@
-##
-## Velocity Template for error end-state
-##
-## Velocity context will contain the following properties
-## flowRequestContext - the Spring Web Flow RequestContext
-## profileRequestContext - root of context tree
-## encoder - HTMLEncoder class
-## request - HttpServletRequest
-## response - HttpServletResponse
-## environment - Spring Environment object for property resolution
-## custom - arbitrary object injected by deployer
-##
-#set ($title = $springMacroRequestContext.getMessage("idp.title", "Web Login Service"))
-#set ($defaultTitleSuffix = $springMacroRequestContext.getMessage("idp.title.suffix", "Error"))
-##
-#if ($flowRequestContext)
-	## This handles flow events, the most common case.
-    #set ($eventId = $flowRequestContext.getCurrentEvent().getId())
-    #set ($eventKey = $springMacroRequestContext.getMessage("$eventId", "error"))
-    #set ($titleSuffix = $springMacroRequestContext.getMessage("${eventKey}.title", "$defaultTitleSuffix"))
-    #set ($message = $springMacroRequestContext.getMessage("${eventKey}.message", "$defaultTitleSuffix: $eventId"))
-    #if ($eventId == "AccessDenied" or $eventId == "ContextCheckDenied")
-        $response.setStatus(403)
-    #elseif ($eventId == "AttributeReleaseRejected" || $eventId == "TermsRejected")
-        $response.setStatus(200)
-    #elseif ($eventKey == "unexpected" || $eventKey == "runtime-error" || $eventKey == "error")
-        $response.setStatus(500)
-    #else
-        $response.setStatus(400)
-    #end
-#elseif ($exception)
-	## This handles exceptions that reach the Spring-MVC exception handler.
-    #set ($eventId = $exception.getClass().getSimpleName())
-    #set ($eventKey = $springMacroRequestContext.getMessage("$eventId", "error"))
-    #set ($titleSuffix = $springMacroRequestContext.getMessage("${eventKey}.title", "$defaultTitleSuffix"))
-    #set ($message = $springMacroRequestContext.getMessage("${eventKey}.message", "$defaultTitleSuffix: $eventId"))
-#else
-	## This is a catch-all that theoretically shouldn't happen?
-    #set ($titleSuffix = $defaultTitleSuffix)
-    #set ($message = $springMacroRequestContext.getMessage("idp.message", "An unidentified error occurred."))
-#end
-##
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width,initial-scale=1.0">
-        <title>$title - $titleSuffix</title>
-        <link rel="stylesheet" type="text/css" href="$request.getContextPath()/css/main.css">
-    </head>
-  	
-    <body>
-    <div class="wrapper">
-    	<div class="container">
-        	<header>
-				<img src="$request.getContextPath()#springMessage("idp.logo")" alt="#springMessageText("idp.logo.alt-text", "logo")">
-				<h3>$title - $titleSuffix</h3>
-			</header>
-		
-        	<div class="content">
-            #evaluate($message)
-            </div>
-    	</div>
-
-      	<footer>
-        	<div class="container container-footer">
-          		<p class="footer-text">#springMessageText("idp.footer", "Insert your footer text here.")</p>
-        	</div>
-      	</footer>
-      	
-    </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/test-compose/idp/container_files/config/shib-idp/views/intercept/attribute-release.vm b/test-compose/idp/container_files/config/shib-idp/views/intercept/attribute-release.vm
deleted file mode 100644
index c170b69..0000000
--- a/test-compose/idp/container_files/config/shib-idp/views/intercept/attribute-release.vm
+++ /dev/null
@@ -1,160 +0,0 @@
-##
-## Velocity Template for DisplayAttributeReleasePage view-state
-##
-## Velocity context will contain the following properties :
-##
-## attributeReleaseContext - context holding consentable attributes
-## attributeReleaseFlowDescriptor - attribute consent flow descriptor
-## attributeDisplayNameFunction - function to display attribute name
-## attributeDisplayDescriptionFunction - function to display attribute description
-## consentContext - context representing the state of a consent flow
-## encoder - HTMLEncoder class
-## flowExecutionKey - SWF execution key (this is built into the flowExecutionUrl)
-## flowExecutionUrl - form action location
-## flowRequestContext - Spring Web Flow RequestContext
-## profileRequestContext - OpenSAML profile request context
-## request - HttpServletRequest
-## response - HttpServletResponse
-## rpUIContext - context with SP UI information from the metadata
-## environment - Spring Environment object for property resolution
-#set ($serviceName = $rpUIContext.serviceName)
-#set ($serviceDescription = $rpUIContext.serviceDescription)
-#set ($informationURL = $rpUIContext.informationURL)
-#set ($privacyStatementURL = $rpUIContext.privacyStatementURL)
-#set ($rpOrganizationLogo = $rpUIContext.getLogo())
-#set ($rpOrganizationName = $rpUIContext.organizationDisplayName)
-#set ($replaceDollarWithNewline = true)
-##
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="UTF-8">
-        <meta name="viewport" content="width=device-width,initial-scale=1.0">
-        <link rel="stylesheet" type="text/css" href="$request.getContextPath()/css/consent.css">
-        <title>#springMessageText("idp.attribute-release.title", "Information Release")</title>
-    </head>
-    <body>
-        <form action="$flowExecutionUrl" method="post" style="padding:10px" >
-            #parse("csrf/csrf.vm")
-            <div class="box">
-                <header>
-                    <img src="$request.getContextPath()#springMessage("idp.logo")" alt="#springMessageText("idp.logo.alt-text", "logo")" class="federation_logo">
-                    #if ($rpOrganizationLogo)
-                        <img src="$encoder.encodeForHTMLAttribute($rpOrganizationLogo)" alt="logo for $encoder.encodeForHTMLAttribute($serviceName)" class="organization_logo">
-                    #end
-                </header>
-                #if ($serviceName)
-                    <p style="margin-top: 70px;">
-                        #springMessageText("idp.attribute-release.serviceNameLabel", "You are about to access the service:")<br>
-                        <span class="service_name">$serviceName</span>
-                        #if ($rpOrganizationName)
-                            #springMessageText("idp.attribute-release.of", "of") <span class="organization_name">$encoder.encodeForHTML($rpOrganizationName)</span>
-                        #end
-                    </p>
-                #end
-                #if ($serviceDescription)
-                    <p style="margin-top: 10px;">
-                        #springMessageText("idp.attribute-release.serviceDescriptionLabel", "Description as provided by this service:")<br>
-                        <span class="service_description">$encoder.encodeForHTML($serviceDescription)</span>
-                        <br>
-                    </p>
-                #end
-                #if ($informationURL)
-                    <p style="margin-top: 10px;">
-                        <a href="$informationURL">#springMessageText("idp.attribute-release.informationURLLabel", "Additional information about the service")</a>
-                    </p>
-                #end
-                <div id="attributeRelease">
-                    <table>
-                        <thead>
-                            <tr>
-                                <th colspan="3">
-                                    #springMessageText("idp.attribute-release.attributesHeader", "Information to be Provided to Service")
-                                </th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            #foreach ($attribute in $attributeReleaseContext.getConsentableAttributes().values())
-                                <tr>
-                                    <td>$encoder.encodeForHTML($attributeDisplayNameFunction.apply($attribute))</td>
-                                    <td>
-                                        #foreach ($value in $attribute.values)
-                                            #if ($replaceDollarWithNewline)
-                                                #set ($encodedValue = $encoder.encodeForHTML($value.getDisplayValue()).replaceAll($encoder.encodeForHTML('$'),"<br>"))
-                                            #else
-                                                #set ($encodedValue = $encoder.encodeForHTML($value.getDisplayValue()))
-                                            #end
-                                            #if ($attributeReleaseFlowDescriptor.perAttributeConsentEnabled)
-                                                <label for="$attribute.id"><strong>$encodedValue</strong></label>
-                                            #else
-                                                <strong>$encodedValue</strong>
-                                            #end
-                                            <br>
-                                        #end
-                                    </td>
-                                    <td style="vertical-align: top">
-                                        #if ($attributeReleaseFlowDescriptor.perAttributeConsentEnabled)
-                                            #set ($inputType = "checkbox")
-                                        #else
-                                            #set ($inputType = "hidden")
-                                        #end
-                                        <input id="$attribute.id" type="$inputType" name="_shib_idp_consentIds" value="$encoder.encodeForHTML($attribute.id)" checked>
-                                    </td>
-                                </tr>
-                            #end
-                        </tbody>
-                    </table>
-                </div>
-                #if ($privacyStatementURL)
-                    <p style="margin-top: 10px;">
-                        <a href="$privacyStatementURL">#springMessageText("idp.attribute-release.privacyStatementURLLabel", "Data privacy information of the service")</a>
-                    </p>
-                #end
-                <div style="float:left;">
-                    <p>
-                        #springMessageText("idp.attribute-release.confirmationQuestion", "The information above would be shared with the service if you proceed. Do you agree to release this information to the service every time you access it?")
-                    </p>
-                    #if ($attributeReleaseFlowDescriptor.doNotRememberConsentAllowed || $attributeReleaseFlowDescriptor.globalConsentAllowed)
-                        <div id="generalConsentDiv" style="display: block; background-color: #F6F6F6;border: 1px gray solid; padding: 10px; width: 92%;">
-                        #springMessageText("idp.attribute-release.consentMethod", "Select an information release consent duration:")
-                    #end
-                    #if ($attributeReleaseFlowDescriptor.doNotRememberConsentAllowed)
-                        <p>
-                            <input id="_shib_idp_doNotRememberConsent" type="radio" name="_shib_idp_consentOptions" value="_shib_idp_doNotRememberConsent">
-                            <label for="_shib_idp_doNotRememberConsent">#springMessageText("idp.attribute-release.doNotRememberConsent", "Ask me again at next login")</label>
-                            <ul>
-                                <li>#springMessageText("idp.attribute-release.doNotRememberConsentItem", "I agree to send my information this time.")</li>
-                            </ul>
-                        </p>
-                    #end
-                    #if ($attributeReleaseFlowDescriptor.doNotRememberConsentAllowed || $attributeReleaseFlowDescriptor.globalConsentAllowed)
-                        <p>
-                            <input id="_shib_idp_rememberConsent" type="radio" name="_shib_idp_consentOptions" value="_shib_idp_rememberConsent" checked>
-                            <label for="_shib_idp_rememberConsent">#springMessageText("idp.attribute-release.rememberConsent", "Ask me again if information changes")</label>
-                            <ul>
-                                <li>#springMessageText("idp.attribute-release.rememberConsentItem", "I agree that the same information will be sent automatically to this service in the future.")</li>
-                            </ul>
-                        </p>
-                    #end
-                    #if ($attributeReleaseFlowDescriptor.globalConsentAllowed)
-                        <p>
-                            <input id="_shib_idp_globalConsent" type="radio" name="_shib_idp_consentOptions" value="_shib_idp_globalConsent">
-                            <label for="_shib_idp_globalConsent">#springMessageText("idp.attribute-release.globalConsent", "Do not ask me again")</label>
-                            <ul>
-                                <li>#springMessageText("idp.attribute-release.globalConsentItem", "I agree that <strong>all</strong> of my information will be released to <strong>any</strong> service.")</li>
-                            </ul>
-                        </p>
-                    #end
-                    #if ($attributeReleaseFlowDescriptor.doNotRememberConsentAllowed || $attributeReleaseFlowDescriptor.globalConsentAllowed)
-                        #springMessageText("idp.attribute-release.consentMethodRevoke", "This setting can be revoked at any time with the checkbox on the login page.")
-                        </div>
-                    #end
-                    <p style="text-align: center;">
-                        <input type="submit" name="_eventId_AttributeReleaseRejected" value="#springMessageText("idp.attribute-release.reject", "Reject")" style="margin-right: 30px;">
-                        <input type="submit" name="_eventId_proceed" value="#springMessageText("idp.attribute-release.accept", "Accept")">
-                    </p>
-                </div>
-            </div>
-        </form>
-    </body>
-</html>
diff --git a/test-compose/idp/container_files/config/shib-idp/views/intercept/expiring-password.vm b/test-compose/idp/container_files/config/shib-idp/views/intercept/expiring-password.vm
deleted file mode 100644
index 4395844..0000000
--- a/test-compose/idp/container_files/config/shib-idp/views/intercept/expiring-password.vm
+++ /dev/null
@@ -1,54 +0,0 @@
-##
-## Velocity Template for expiring password view
-##
-## Velocity context will contain the following properties
-## flowExecutionUrl - the form action location
-## flowRequestContext - the Spring Web Flow RequestContext
-## flowExecutionKey - the SWF execution key (this is built into the flowExecutionUrl)
-## profileRequestContext - root of context tree
-## authenticationContext - context with authentication request information
-## authenticationErrorContext - context with login error state
-## authenticationWarningContext - context with login warning state
-## ldapResponseContext - context with LDAP state (if using native LDAP)
-## encoder - HTMLEncoder class
-## request - HttpServletRequest
-## response - HttpServletResponse
-## environment - Spring Environment object for property resolution
-## custom - arbitrary object injected by deployer
-##
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width,initial-scale=1.0">
-        <title>#springMessageText("idp.title", "Web Login Service")</title>
-        <link rel="stylesheet" type="text/css" href="$request.getContextPath()/css/main.css">
-        <meta http-equiv="refresh" content="20;url=$flowExecutionUrl&_eventId_proceed=1">
-    </head>
-      
-    <body>
-      <div class="wrapper">
-        <div class="container">
-            <header>
-                <img src="$request.getContextPath()#springMessage("idp.logo")" alt="#springMessageText("idp.logo.alt-text", "logo")">
-                <h3>#springMessageText("idp.login.expiringSoon", "Your password will be expiring soon!")</h3>
-            </header>
-        
-            <div class="content">
-                <p>#springMessageText("idp.login.changePassword", "To create a new password now, go to")
-                <strong><a href="#" target="_blank">#</a></strong>.</p>
-                <p>#springMessageText("idp.login.proceedBegin", "Your login will proceed in 20 seconds or you may click")
-                <strong><a href="$flowExecutionUrl&_eventId_proceed=1">#springMessageText("idp.login.proceedHere", "here")</a></strong>
-                #springMessageText("idp.login.proceedEnd", "to continue").</p>
-            </div>
-        </div>
-
-        <footer>
-          <div class="container container-footer">
-            <p class="footer-text">#springMessageText("idp.footer", "Insert your footer text here.")</p>
-          </div>
-        </footer>
-          
-      </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/test-compose/idp/container_files/config/shib-idp/views/intercept/impersonate.vm b/test-compose/idp/container_files/config/shib-idp/views/intercept/impersonate.vm
deleted file mode 100644
index 37c486c..0000000
--- a/test-compose/idp/container_files/config/shib-idp/views/intercept/impersonate.vm
+++ /dev/null
@@ -1,90 +0,0 @@
-##
-## Velocity Template for expiring password view
-##
-## Velocity context will contain the following properties
-## flowExecutionUrl - the form action location
-## flowRequestContext - the Spring Web Flow RequestContext
-## flowExecutionKey - the SWF execution key (this is built into the flowExecutionUrl)
-## profileRequestContext - root of context tree
-## rpUIContext - the context with SP UI information from the metadata
-## encoder - HTMLEncoder class
-## request - HttpServletRequest
-## response - HttpServletResponse
-## environment - Spring Environment object for property resolution
-## custom - arbitrary object injected by deployer
-##
-#set ($rpContext = $profileRequestContext.getSubcontext('net.shibboleth.idp.profile.context.RelyingPartyContext'))
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width,initial-scale=1.0">
-        <title>#springMessageText("idp.title", "Web Login Service")</title>
-        <link rel="stylesheet" type="text/css" href="$request.getContextPath()/css/main.css">
-    </head>
-      
-    <body>
-      <div class="wrapper">
-        <div class="container">
-          <header>
-            <img src="$request.getContextPath()#springMessage("idp.logo")" alt="#springMessageText("idp.logo.alt-text", "logo")">
-              <h3>#springMessageText("idp.impersonate.header", "Account Impersonation")</h3>
-          </header>
-        
-          <div class="content">
-
-            <form action="$flowExecutionUrl" method="post">
-            #parse("csrf/csrf.vm")
-            #set ($serviceName = $rpUIContext.serviceName)
-            #if ($serviceName && !$rpContext.getRelyingPartyId().contains($serviceName))
-              <legend>
-                $encoder.encodeForHTML($serviceName)
-              </legend>
-            #end
-
-              <legend>
-                #springMessageText("idp.impersonate.text", "Enter an account name to impersonate to this service or continue normally.")
-              </legend>
-
-              <div class="form-element-wrapper">
-                <label for="impersonation">#springMessageText("idp.impersonate.login-as", "Login as")</label>
-                <input class="form-element form-field" id="impersonation" name="principal" type="text" />
-                
-                <!-- Defaults to input box above, example below populates a select list from an IdPAttribute. -->
-                <!--
-                #set ($attributeContext = $rpContext.getSubcontext('net.shibboleth.idp.attribute.context.AttributeContext'))
-                #set ($usernamesAttribute = $attributeContext.getUnfilteredIdPAttributes().get("impersonatableUsernames"))
-                <select class="form-element form-field" id="impersonation" name="principal">
-                #if ($usernamesAttribute)
-                  #foreach ($username in $usernamesAttribute.getValues())
-                    <option value="$encoder.encodeForHTML($username.getValue())">$encoder.encodeForHTML($username.getValue())</option>
-                  #end
-                #end
-                </select>
-                -->
-              </div>
-
-              <div class="form-element-wrapper">
-                <button class="form-element form-button" type="submit" name="_eventId_impersonate"
-                    >#springMessageText("idp.impersonate.impersonate", "Impersonate")</button>
-              </div>
-
-              <div class="form-element-wrapper">
-                <button class="form-element form-button" type="submit" name="_eventId_proceed"
-                    >#springMessageText("idp.impersonate.continue", "Continue Normally")</button>
-              </div>
-                
-            </form>
-
-          </div>
-        </div>
-
-        <footer>
-          <div class="container container-footer">
-            <p class="footer-text">#springMessageText("idp.footer", "Insert your footer text here.")</p>
-          </div>
-        </footer>
-          
-      </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/test-compose/idp/container_files/config/shib-idp/views/intercept/terms-of-use.vm b/test-compose/idp/container_files/config/shib-idp/views/intercept/terms-of-use.vm
deleted file mode 100644
index 67b2c15..0000000
--- a/test-compose/idp/container_files/config/shib-idp/views/intercept/terms-of-use.vm
+++ /dev/null
@@ -1,69 +0,0 @@
-##
-## Velocity Template for DisplayTermsOfUsePage view-state
-##
-## Velocity context will contain the following properties :
-##
-## encoder - HTMLEncoder class
-## flowExecutionKey - SWF execution key (this is built into the flowExecutionUrl)
-## flowExecutionUrl - form action location
-## flowRequestContext - Spring Web Flow RequestContext
-## request - HttpServletRequest
-## response - HttpServletResponse
-## rpUIContext - context with SP UI information from the metadata
-## termsOfUseId - terms of use ID to lookup message strings
-## environment - Spring Environment object for property resolution
-#set ($serviceName = $rpUIContext.serviceName)
-#set ($rpOrganizationLogo = $rpUIContext.getLogo())
-##
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="UTF-8">
-        <meta name="viewport" content="width=device-width,initial-scale=1.0">
-        <link rel="stylesheet" type="text/css" href="$request.getContextPath()/css/consent.css">
-        <title>#springMessageText("${termsOfUseId}.title", "Terms of Use")</title>
-    </head>
-    <body>
-        <div class="box">
-            <header>
-                <img src="$request.getContextPath()#springMessage("idp.logo")" alt="#springMessageText("idp.logo.alt-text", "logo")" class="federation_logo">
-                #if ($rpOrganizationLogo)
-                    <img src="$encoder.encodeForHTMLAttribute($rpOrganizationLogo)" alt="$encoder.encodeForHTMLAttribute($serviceName)" class="organization_logo">
-                #end
-            </header>
-            #if ($rpOrganizationLogo)
-                <div style="float:left;">
-                    <h1>#springMessageText("${termsOfUseId}.title", "Terms of Use")</h1>
-                </div>
-            #end
-            <div id="tou-content">
-                #springMessageText("${termsOfUseId}.text", "Terms of Use Text...")
-            </div>
-            <div id="tou-acceptance">
-                <div style="float:left;">
-                    <form action="$flowExecutionUrl" method="post" >
-                        #parse("csrf/csrf.vm")
-                        <input type="submit" name="_eventId_TermsRejected" value="#springMessageText("idp.terms-of-use.reject", "Refuse")" style="margin-right: 30px;">
-                    </form>
-                </div>
-                <div style="float:right;">
-                    <form action="$flowExecutionUrl" method="post" >
-                        #parse("csrf/csrf.vm")
-                        <input id="accept" type="checkbox" name="_shib_idp_consentIds" value="$encoder.encodeForHTML($termsOfUseId)" required>
-                        <label for="accept">#springMessageText("idp.terms-of-use.accept", "I accept the terms of use")</label>
-                        #if ($requireCheckbox)
-                            <p class="form-error">#springMessageText("idp.terms-of-use.required", "Please check this box if you want to proceed.")</p>
-                        #end
-                        <input type="submit" name="_eventId_proceed" value="#springMessageText("idp.terms-of-use.submit", "Submit")">
-                    </form>
-                </div>
-                <div style="clear:both;"></div>
-            </div>
-            <footer>
-                <div class="container container-footer">
-                    <p class="footer-text">#springMessageText("idp.footer", "Insert your footer text here.")</p>
-                </div>
-            </footer>
-        </div>
-    </body>
-</html>
diff --git a/test-compose/idp/container_files/config/shib-idp/views/login-error.vm b/test-compose/idp/container_files/config/shib-idp/views/login-error.vm
deleted file mode 100644
index 224976b..0000000
--- a/test-compose/idp/container_files/config/shib-idp/views/login-error.vm
+++ /dev/null
@@ -1,26 +0,0 @@
-## Velocity Template for login error message production, included by login.vm
-##
-## authenticationErrorContext - context containing error data, if available
-##
-#if ($authenticationErrorContext && $authenticationErrorContext.getClassifiedErrors().size() > 0)
-    ## This handles errors that are classified by the message maps in the authentication config.
-    #set ($eventId = $authenticationErrorContext.getClassifiedErrors().iterator().next())
-    #if ($eventId != "ReselectFlow")
-        #set ($eventKey = $springMacroRequestContext.getMessage("$eventId", "login"))
-        #set ($message = $springMacroRequestContext.getMessage("${eventKey}.message", "Login Failure: $eventId"))
-    #end
-#elseif ($authenticationErrorContext && $authenticationErrorContext.getExceptions().size() > 0)
-    ## This handles login exceptions that are left unclassified.
-    #set ($loginException = $authenticationErrorContext.getExceptions().get(0))
-    #if ($loginException.getMessage())
-        #set ($message = "Login Failure: $loginException.getMessage()")
-    #else
-    	#set ($message = $loginException.toString())
-    #end
-#end
-
-#if ($message)
-    <section>
-        <p class="form-element form-error">$encoder.encodeForHTML($message)</p>
-    </section>
-#end
diff --git a/test-compose/idp/container_files/config/shib-idp/views/login.vm b/test-compose/idp/container_files/config/shib-idp/views/login.vm
deleted file mode 100644
index 7609d40..0000000
--- a/test-compose/idp/container_files/config/shib-idp/views/login.vm
+++ /dev/null
@@ -1,144 +0,0 @@
-##
-## Velocity Template for DisplayUsernamePasswordPage view-state
-##
-## Velocity context will contain the following properties
-## flowExecutionUrl - the form action location
-## flowRequestContext - the Spring Web Flow RequestContext
-## flowExecutionKey - the SWF execution key (this is built into the flowExecutionUrl)
-## profileRequestContext - root of context tree
-## authenticationContext - context with authentication request information
-## authenticationErrorContext - context with login error state
-## authenticationWarningContext - context with login warning state
-## ldapResponseContext - context with LDAP state (if using native LDAP)
-## rpUIContext - the context with SP UI information from the metadata
-## extendedAuthenticationFlows - collection of "extended" AuthenticationFlowDescriptor objects
-## passwordPrincipals - contents of the shibboleth.authn.Password.PrincipalOverride bean
-## encoder - HTMLEncoder class
-## request - HttpServletRequest
-## response - HttpServletResponse
-## environment - Spring Environment object for property resolution
-## custom - arbitrary object injected by deployer
-##
-#set ($rpContext = $profileRequestContext.getSubcontext('net.shibboleth.idp.profile.context.RelyingPartyContext'))
-#set ($username = $authenticationContext.getSubcontext('net.shibboleth.idp.authn.context.UsernamePasswordContext', true).getUsername())
-#set ($passwordEnabled = false)
-#if (!$passwordPrincipals or $passwordPrincipals.isEmpty() or $authenticationContext.isAcceptable($passwordPrincipals))
-  #set ($passwordEnabled = true)
-#end
-##
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width,initial-scale=1.0">
-        <title>#springMessageText("idp.title", "Web Login Service")</title>
-        <link rel="stylesheet" type="text/css" href="$request.getContextPath()/css/main.css">
-    </head>
-    <body>
-    <div class="wrapper">
-      <div class="container">
-        <header>
-          <img src="$request.getContextPath()#springMessage("idp.logo")" alt="#springMessageText("idp.logo.alt-text", "logo")">
-        </header>
-
-        <div class="content">
-          <div class="column one">
-            #parse("login-error.vm")
-
-            <form action="$flowExecutionUrl" method="post">
-            #parse("csrf/csrf.vm")
-            #set ($serviceName = $rpUIContext.serviceName)
-            #if ($serviceName && !$rpContext.getRelyingPartyId().contains($serviceName))
-              <legend>
-                #springMessageText("idp.login.loginTo", "Login to") $encoder.encodeForHTML($serviceName)
-              </legend>
-            #end
-                        
-            #if ($passwordEnabled)
-              <div class="form-element-wrapper">
-                <label for="username">#springMessageText("idp.login.username", "Username")</label>
-                <input class="form-element form-field" id="username" name="j_username" type="text"
-                    value="#if($username)$encoder.encodeForHTML($username)#end" />
-              </div>
-
-              <div class="form-element-wrapper">
-                <label for="password">#springMessageText("idp.login.password", "Password")</label>
-                <input class="form-element form-field" id="password" name="j_password" type="password" value="" />
-              </div>
-
-              ## You may need to modify this to taste, such as changing the flow name its checking for to authn/MFA.
-              #if (!$authenticationContext.getActiveResults().containsKey('authn/Password'))
-              <div class="form-element-wrapper">
-                <input type="checkbox" name="donotcache" value="1" id="donotcache">
-                <label for="donotcache">#springMessageText("idp.login.donotcache", "Don't Remember Login")</label>
-               </div>
-              #end
-              
-            #end
-
-              <div class="form-element-wrapper">
-                <input id="_shib_idp_revokeConsent" type="checkbox" name="_shib_idp_revokeConsent" value="true" />
-                <label for="_shib_idp_revokeConsent">#springMessageText("idp.attribute-release.revoke", "Clear prior granting of permission for release of your information to this service.")</label>
-              </div>
-
-            #if ($passwordEnabled)
-              <div class="form-element-wrapper">
-                <button class="form-element form-button" type="submit" name="_eventId_proceed"
-                    onClick="this.childNodes[0].nodeValue='#springMessageText("idp.login.pleasewait", "Logging in, please wait...")'"
-                    >#springMessageText("idp.login.login", "Login")</button>
-              </div>
-            #end
-
-            #foreach ($extFlow in $extendedAuthenticationFlows)
-              #if ($authenticationContext.isAcceptable($extFlow) and $extFlow.apply(profileRequestContext))
-                <div class="form-element-wrapper">
-                  <button class="form-element form-button" type="submit" name="_eventId_$extFlow.getId()">
-                    #springMessageText("idp.login.$extFlow.getId().replace('authn/','')", $extFlow.getId().replace('authn/',''))
-                  </button>
-                </div>
-              #end
-            #end
-            </form>
-
-            #*
-              //
-              //    SP Description & Logo (optional)
-              //    These idpui lines will display added information (if available
-              //    in the metadata) about the Service Provider (SP) that requested
-              //    authentication. These idpui lines are "active" in this example
-              //    (not commented out) - this extra SP info will be displayed.
-              //    Remove or comment out these lines to stop the display of the
-              //    added SP information.
-              //
-            *#
-            #set ($logo = $rpUIContext.getLogo())
-            #if ($logo)
-              <img src= "$encoder.encodeForHTMLAttribute($logo)"
-                  alt="$encoder.encodeForHTMLAttribute($serviceName)">
-            #end
-            #set ($desc = $rpUIContext.getServiceDescription())
-            #if ($desc)
-              $encoder.encodeForHTML($desc)
-            #end
-            
-          </div>
-          <div class="column two">
-            <ul class="list list-help">
-              #if ($passwordEnabled)
-                <li class="list-help-item"><a href="#springMessageText("idp.url.password.reset", '#')"><span class="item-marker">&rsaquo;</span> #springMessageText("idp.login.forgotPassword", "Forgot your password?")</a></li>
-              #end
-              <li class="list-help-item"><a href="#springMessageText("idp.url.helpdesk", '#')"><span class="item-marker">&rsaquo;</span> #springMessageText("idp.login.needHelp", "Need Help?")</a></li>
-            </ul>
-          </div>
-        </div>
-      </div>
-
-      <footer>
-        <div class="container container-footer">
-          <p class="footer-text">#springMessageText("idp.footer", "Insert your footer text here.")</p>
-        </div>
-      </footer>
-    </div>
-    
-     </body>
-</html>
\ No newline at end of file
diff --git a/test-compose/idp/container_files/config/shib-idp/views/logout-complete.vm b/test-compose/idp/container_files/config/shib-idp/views/logout-complete.vm
deleted file mode 100644
index 7341e69..0000000
--- a/test-compose/idp/container_files/config/shib-idp/views/logout-complete.vm
+++ /dev/null
@@ -1,67 +0,0 @@
-##
-## Velocity Template for logout flow's concluding view-state (no propagation)
-##
-## Velocity context will contain the following properties
-## flowExecutionUrl - the form action location
-## flowRequestContext - the Spring Web Flow RequestContext
-## flowExecutionKey - the SWF execution key (this is built into the flowExecutionUrl)
-## profileRequestContext - root of context tree
-## logoutContext - context with SPSession details for logout operation
-## multiRPContext - context with RelyingPartyContexts and possibly SP UI information from the metadata
-## encoder - HTMLEncoder class
-## request - HttpServletRequest
-## response - HttpServletResponse
-## environment - Spring Environment object for property resolution
-## custom - arbitrary object injected by deployer
-##
-#set ($activeIdPSessions = $logoutContext and !$logoutContext.getIdPSessions().isEmpty())
-#set ($activeSPSessions = $logoutContext and !$logoutContext.getSessionMap().isEmpty())
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width,initial-scale=1.0">
-        <title>#springMessageText("idp.title", "Web Login Service")</title>
-        <link rel="stylesheet" type="text/css" href="$request.getContextPath()/css/main.css">
-    </head>
-
-    <body>
-    <div class="wrapper">
-      <div class="container">
-        <header>
-          <img src="$request.getContextPath()#springMessage("idp.logo")" alt="#springMessageText("idp.logo.alt-text", "logo")">
-        </header>
-
-        <div class="content">
-          <div class="column one">
-          #if ($activeIdPSessions)
-            <p>#springMessageText("idp.logout.cancelled", "Logout has been cancelled.")</p>
-          #elseif ($activeSPSessions)
-            <p>#springMessageText("idp.logout.local", "You elected not to log out of all the applications accessed during your session.")</p>
-          #else
-            <p>#springMessageText("idp.logout.complete", "The logout operation is complete, and no other services appear to have been accessed during this session.")</p>
-          #end
-          </div>
-          <div class="column two">
-            <ul class="list list-help">
-              <li class="list-help-item"><a href="#springMessageText("idp.url.password.reset", '#')"><span class="item-marker">&rsaquo;</span> #springMessageText("idp.login.forgotPassword", "Forgot your password?")</a></li>
-              <li class="list-help-item"><a href="#springMessageText("idp.url.helpdesk", '#')"><span class="item-marker">&rsaquo;</span> #springMessageText("idp.login.needHelp", "Need Help?")</a></li>
-            </ul>
-          </div>
-        </div>
-      </div>
-
-      <!-- If SAML logout, complete the flow by adding a hidden iframe. -->
-      #if ( $profileRequestContext.getProfileId().contains("saml2/logout") )
-          <iframe style="display:none" src="$flowExecutionUrl&_eventId=proceed"></iframe>
-      #end
-
-      <footer>
-        <div class="container container-footer">
-          <p class="footer-text">#springMessageText("idp.footer", "Insert your footer text here.")</p>
-        </div>
-      </footer>
-    </div>
-    
- 	</body>
-</html>
\ No newline at end of file
diff --git a/test-compose/idp/container_files/config/shib-idp/views/logout-propagate.vm b/test-compose/idp/container_files/config/shib-idp/views/logout-propagate.vm
deleted file mode 100644
index 470eff5..0000000
--- a/test-compose/idp/container_files/config/shib-idp/views/logout-propagate.vm
+++ /dev/null
@@ -1,58 +0,0 @@
-##
-## Velocity Template for logout flow's concluding view-state (with propagation)
-##
-## Velocity context will contain the following properties
-## flowExecutionUrl - the form action location
-## flowRequestContext - the Spring Web Flow RequestContext
-## flowExecutionKey - the SWF execution key (this is built into the flowExecutionUrl)
-## profileRequestContext - root of context tree
-## logoutContext - context with SPSession details for logout operation
-## multiRPContext - context with RelyingPartyContexts and possibly SP UI information from the metadata
-## htmlEncoder - HTMLEncoder class
-## urlEncoder - urlEncoder class
-## codecUtil - CodecUtil class
-## request - HttpServletRequest
-## response - HttpServletResponse
-## environment - Spring Environment object for property resolution
-## custom - arbitrary object injected by deployer
-##
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width,initial-scale=1.0">
-        <title>#springMessageText("idp.title", "Web Login Service")</title>
-        <link rel="stylesheet" type="text/css" href="$request.getContextPath()/css/main.css">
-        <link rel="stylesheet" type="text/css" href="$request.getContextPath()/css/logout.css">
-    </head>
-
-    <body>
-    <div class="wrapper">
-      <div class="container">
-        <header>
-          <img src="$request.getContextPath()#springMessage("idp.logo")" alt="#springMessageText("idp.logo.alt-text", "logo")">
-        </header>
-
-        <div class="content">
-          <div class="column one">
-              <p>#springMessageText("idp.logout.attempt", "Attempting to log out of the following services:")</p>
-              #parse("logout/propagate.vm")
-          </div>
-          <div class="column two">
-            <ul class="list list-help">
-              <li class="list-help-item"><a href="#springMessageText("idp.url.password.reset", '#')"><span class="item-marker">&rsaquo;</span> #springMessageText("idp.login.forgotPassword", "Forgot your password?")</a></li>
-              <li class="list-help-item"><a href="#springMessageText("idp.url.helpdesk", '#')"><span class="item-marker">&rsaquo;</span> #springMessageText("idp.login.needHelp", "Need Help?")</a></li>
-            </ul>
-          </div>
-        </div>
-      </div>
-
-      <footer>
-        <div class="container container-footer">
-          <p class="footer-text">#springMessageText("idp.footer", "Insert your footer text here.")</p>
-        </div>
-      </footer>
-    </div>
-    
- 	</body>
-</html>
\ No newline at end of file
diff --git a/test-compose/idp/container_files/config/shib-idp/views/logout.vm b/test-compose/idp/container_files/config/shib-idp/views/logout.vm
deleted file mode 100644
index 0b9103b..0000000
--- a/test-compose/idp/container_files/config/shib-idp/views/logout.vm
+++ /dev/null
@@ -1,133 +0,0 @@
-##
-## Velocity Template for logout flow's starting view-state
-##
-## Velocity context will contain the following properties
-## flowExecutionUrl - the form action location
-## flowRequestContext - the Spring Web Flow RequestContext
-## flowExecutionKey - the SWF execution key (this is built into the flowExecutionUrl)
-## profileRequestContext - root of context tree
-## logoutContext - context with SPSession details for logout operation
-## multiRPContext - context with RelyingPartyContexts and possibly SP UI information from the metadata
-## encoder - HTMLEncoder class
-## request - HttpServletRequest
-## response - HttpServletResponse
-## environment - Spring Environment object for property resolution
-## custom - arbitrary object injected by deployer
-##
-#set ($rpContext = $profileRequestContext.getSubcontext("net.shibboleth.idp.profile.context.RelyingPartyContext"))
-#if ($rpContext)
-#set ($rpUIContext = $rpContext.getSubcontext("net.shibboleth.idp.ui.context.RelyingPartyUIContext"))
-#end
-#set ($promptForIdP = $logoutContext and !$logoutContext.getIdPSessions().isEmpty())
-#set ($promptForSP = $logoutContext and !$logoutContext.getSessionMap().isEmpty())
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width,initial-scale=1.0">
-        #*
-        #if ($promptForSP)
-            <meta http-equiv="refresh" content="10;url=$flowExecutionUrl&_eventId=propagate">
-        #elseif ($promptForIdP)
-            <meta http-equiv="refresh" content="10;url=$flowExecutionUrl&_eventId=local">
-        #end
-        *#
-        <title>#springMessageText("idp.title", "Web Login Service")</title>
-        <link rel="stylesheet" type="text/css" href="$request.getContextPath()/css/main.css">
-    </head>
-
-    <body>
-    <div class="wrapper">   
-      <div class="container">
-        <header>
-          <img src="$request.getContextPath()#springMessage("idp.logo")" alt="#springMessageText("idp.logo.alt-text", "logo")">
-        </header>
-
-        <div class="content">
-          <div class="column one">
-            <p>This page is displayed when a logout operation at the Identity Provider completes. This page is an example
-            and should be customized. It is not fully internationalized because the presentation will be a highly localized
-            decision, and we don't have a good suggestion for a default.</p>
-            <br>
-    
-            #if ($rpContext)
-              <p>#springMessageText("idp.logout.sp-initiated", "You have been logged out of the following service:")</p>
-              <blockquote>
-              #if ($rpUIContext)
-                  $encoder.encodeForHTML($rpUIContext.getServiceName())
-              #else
-                  $encoder.encodeForHTML($rpContext.getRelyingPartyId())
-              #end
-              </blockquote>
-              <br>
-            #end
-            
-            #if ($promptForIdP or $promptForSP)
-              <p>#springMessageText("idp.logout.prompt", "Choose one of the following, or wait a few seconds for the default.")</p>
-              <br>
-
-              <form id="propagate_form" method="POST" action="$flowExecutionUrl">
-                
-                <div class="form-element-wrapper">
-                  <button id="logout_local" class="form-element form-button" type="submit" name="_eventId" value="local">#springMessageText("idp.logout.idponly", "Logout Locally")</button>
-                  <p>#springMessageText("idp.logout.idponly.caption", "End your SSO session.")</p>
-                </div>
-            #end
-
-            #if ($promptForSP)
-                <div class="form-element-wrapper">
-                  <button id="logout_propagate" class="form-element form-button" type="submit" name="_eventId" value="propagate">#springMessageText("idp.logout.global", "Logout Globally")</button>
-                  <p>#springMessageText("idp.logout.global.caption", "End your SSO session and attempt logout of services accessed during session.")</p>
-                  <br>
-                  <p>#springMessageText("idp.logout.contactServices", "If instructed, the system will attempt to contact the following services:")</p>
-                  <ol>
-                  #foreach ($sp in $logoutContext.getSessionMap().keySet())
-                    #set ($rpCtx = $multiRPContext.getRelyingPartyContextById($sp))
-                    #if ($rpCtx)
-                      #set ($rpUIContext = $rpCtx.getSubcontext("net.shibboleth.idp.ui.context.RelyingPartyUIContext"))
-                    #end
-                    #if ($rpUIContext and $rpUIContext.getServiceName())
-                      <li>$encoder.encodeForHTML($rpUIContext.getServiceName())</li>
-                    #else
-                      <li>$encoder.encodeForHTML($sp)</li>
-                    #end
-                  #end
-                  </ol>
-                  <br>
-                </div>
-            #end
-
-            #if ($promptForIdP)
-                <div class="form-element-wrapper">
-                  <button id="logout_cancel" class="form-element form-button" type="submit" name="_eventId" value="end">#springMessageText("idp.logout.cancel", "Cancel")</button>
-                  <p>#springMessageText("idp.logout.cancel.caption", "Cancel logout and retain your SSO session.")</p>
-                </div>
-            #end
-            
-            #if ($promptForIdP or $promptForSP)
-              </form>
-            #else
-                <p><strong>#springMessageText("idp.logout.complete", "The logout operation is complete, and no other services appear to have been accessed during this session.")</strong></p>
-                <!-- Complete the flow by adding a hidden iframe. -->
-                <iframe style="display:none" src="$flowExecutionUrl&_eventId=proceed"></iframe>
-            #end
-
-          </div>
-          <div class="column two">
-            <ul class="list list-help">
-              <li class="list-help-item"><a href="#springMessageText("idp.url.password.reset", '#')"><span class="item-marker">&rsaquo;</span> #springMessageText("idp.login.forgotPassword", "Forgot your password?")</a></li>
-              <li class="list-help-item"><a href="#springMessageText("idp.url.helpdesk", '#')"><span class="item-marker">&rsaquo;</span> #springMessageText("idp.login.needHelp", "Need Help?")</a></li>
-            </ul>
-          </div>
-        </div>
-      </div>
-
-      <footer>
-        <div class="container container-footer">
-          <p class="footer-text">#springMessageText("idp.footer", "Insert your footer text here.")</p>
-        </div>
-      </footer>
-    </div>
-    
-  </body>
-</html>
\ No newline at end of file
diff --git a/test-compose/idp/container_files/config/shib-idp/views/spnego-unavailable.vm b/test-compose/idp/container_files/config/shib-idp/views/spnego-unavailable.vm
deleted file mode 100644
index 3673f02..0000000
--- a/test-compose/idp/container_files/config/shib-idp/views/spnego-unavailable.vm
+++ /dev/null
@@ -1,49 +0,0 @@
-##
-## Velocity Template for SPNEGO unauthorized page
-##
-## This is not a Spring Webflow view, but a special view internal to the
-## SPNEGO login flow, so it doesn't contain all of the usual SWF variables.
-##
-## Velocity context will contain the following properties
-## encoder - HTMLEncoder class
-## request - HttpServletRequest
-## response - HttpServletResponse
-## profileRequestContext - root of context tree
-## errorUrl - URL to call to indicate error and return back to the login flow
-##
-#set ($eventKey = $springMacroRequestContext.getMessage("SPNEGOUnavailable", "spnego-unavailable"))
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <title>#springMessageText("idp.title", "Web Login Sevice") - #springMessageText("${eventKey}.title", "Error")</title>
-    <link rel="stylesheet" type="text/css" href="$request.getContextPath()/css/main.css">
-  </head>
-  
-  <body onload="window.location = '$errorUrl'">
-    <div class="wrapper">
-      <div class="container">
-        <header>
-          <img src="$request.getContextPath()#springMessage("idp.logo")" alt="#springMessageText("idp.logo.alt-text", "logo")">
-          <h3>#springMessageText("idp.title", "Web Login Sevice") - #springMessage("idp.title.suffix", "Error")</h3>
-        </header>
-                
-        <div class="content">
-          #springMessageText("${eventKey}.message", "Your web browser doesn't support authentication with your desktop login credentials.")
-          <ul class="list list-help">
-            <li class="list-help-item">
-              <a href="$errorUrl"><span class="item-marker">&rsaquo;</span> #springMessageText("spnego-unavailable.return", "Cancel the attempt.")</a>
-            </li>
-          </ul>
-        </div>
-      </div>
-
-      <footer>
-        <div class="container container-footer">
-          <p class="footer-text">#springMessageText("idp.footer", "Insert your footer text here.")</p>
-        </div>
-      </footer>
-    </div>
-  </body>
-</html>
diff --git a/test-compose/idp/container_files/config/shib-idp/views/user-prefs.js b/test-compose/idp/container_files/config/shib-idp/views/user-prefs.js
deleted file mode 100644
index ab994f9..0000000
--- a/test-compose/idp/container_files/config/shib-idp/views/user-prefs.js
+++ /dev/null
@@ -1,45 +0,0 @@
-"use strict";
-
-function createCookie(name, value, seconds) {
-    var date = new Date();
-    date.setTime(date.getTime() + (seconds * 1000));
-    var expires = "; expires=" + date.toGMTString();
-    
-    var path = '$environment.getProperty("idp.cookie.path", $request.getContextPath())';
-    if (path.length > 0)
-        path = "; path=" + path;
-    document.cookie = name + "=" + value + expires + path;
-}
-
-function eraseCookie(name) {
-    createCookie(name, "", -31536000);
-}
-
-function readCookie(name) {
-    var nameEQ = name + "=";
-    var ca = document.cookie.split(';');
-    for (var i = 0; i < ca.length; i++) {
-        var c = ca[i];
-        while (c.charAt(0) == ' ')
-            c = c.substring(1, c.length);
-        if (c.indexOf(nameEQ) == 0)
-            return c.substring(nameEQ.length, c.length);
-    }
-    return null;
-}
-
-function load(id) {
-    var checkbox = document.getElementById(id);
-    if (checkbox != null) {
-        var spnego = readCookie(checkbox.name);
-        checkbox.checked = (spnego == "1");
-    }
-}
-
-function check(checkbox) {
-    if (checkbox.checked) {
-        createCookie(checkbox.name, checkbox.value, $environment.getProperty("idp.cookie.maxAge","31536000"));
-    } else {
-        eraseCookie(checkbox.name);
-    }
-}
diff --git a/test-compose/idp/container_files/config/shib-idp/views/user-prefs.vm b/test-compose/idp/container_files/config/shib-idp/views/user-prefs.vm
deleted file mode 100644
index 8de0503..0000000
--- a/test-compose/idp/container_files/config/shib-idp/views/user-prefs.vm
+++ /dev/null
@@ -1,60 +0,0 @@
-##
-## Velocity Template for user preferences view
-##
-## Velocity context will contain the following properties
-## request - HttpServletRequest
-## response - HttpServletResponse
-## environment - Spring Environment object for property resolution
-## custom - arbitrary object injected by deployer
-##
-<!DOCTYPE html>
-<html>
-    <head>
-    	<meta charset="utf-8">
-    	<meta name="viewport" content="width=device-width,initial-scale=1.0">
-    	<title>#springMessageText("idp.userprefs.title", "Web Login Service") - #springMessageText("idp.userprefs.title.suffix", "Login Preferences")</title>
-    	<link rel="stylesheet" type="text/css" href="$request.getContextPath()/css/main.css">
-    	<script language="Javascript">
-    	<!--
-    	#parse( "user-prefs.js" )
-    	// -->
-    	</script>
-    </head>
-    <body onLoad="document.getElementById('content').style.display='block'; load('spnego')">
-    <div class="wrapper">
-      <div class="container">
-        <header>
-          <img src="$request.getContextPath()#springMessage("idp.logo")" alt="#springMessageText("idp.logo.alt-text", "logo")">
-          <h3>#springMessageText("idp.title", "Web Login Service") - #springMessageText("idp.userprefs.title.suffix", "Login Preferences")</h3>
-          <p>
-          #springMessage("idp.userprefs.info")
-          </p>
-        </header>
-
-        <noscript>
-          <div id="content" class="content">
-            $springMacroRequestContext.getMessage("idp.userprefs.no-js", "This feature requires Javascript.")
-          </div>
-        </noscript>
-        
-        <div id="content" class="content" style="display:none">
-          <div class="form-element-wrapper">
-          <h4>#springMessageText("idp.userprefs.options", "The following options are available:")</h4>
-          </div>
-
-          <div class="form-element-wrapper">
-            <input type="checkbox" id="spnego" name="_idp_spnego_autologin" value="1" onClick="check(this)">
-            #springMessageText("idp.userprefs.spnego", "Automatically try desktop login when available.")
-          </div>
-        </div>
-      </div>
-
-      <footer>
-        <div class="container container-footer">
-          <p class="footer-text">#springMessageText("idp.footer", "Insert your footer text here.")</p>
-        </div>
-      </footer>
-    </div>
-    
- 	</body>
-</html>