diff --git a/metadata/#sp-testbed-tier-metadata.xml~ b/metadata/#sp-testbed-tier-metadata.xml~
deleted file mode 100644
index d0c6947..0000000
--- a/metadata/#sp-testbed-tier-metadata.xml~
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor 
-    Name="https://testbed.tier.internet2.edu/metdata.xml"
-    xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-    xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
-    xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-    xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-	<EntityDescriptor entityID="https://comanage.testbed.tier.internet2.edu/shibboleth"
-			  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-			  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-			  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-			  xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
-			  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-	    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-		<Extensions>
-		    <idpdisc:DiscoveryResponse index="1" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://comanage.testbed.tier.internet2.edu/Shibboleth.sso/Login" />
-		</Extensions>
-
-		<KeyDescriptor>
-		    <ds:KeyInfo>
-			    <ds:X509Data>
-			        <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIJANQLfLilAwsWMA0GCSqGSIb3DQEBBQUAMC4xLDAqBgNV
-BAMTI2NvbWFuYWdlLnRlc3RiZWQudGllci5pbnRlcm5ldDIuZWR1MB4XDTE2MDMz
-MDE1MjA0MVoXDTI2MDMyODE1MjA0MVowLjEsMCoGA1UEAxMjY29tYW5hZ2UudGVz
-dGJlZC50aWVyLmludGVybmV0Mi5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDQsAVSXx2VqDY2ZTHD5EhPwZV7uG/KgISpNqNG9kbKjgLJIPJUchJq
-pKXrn3S8HNS2/X83AEQ5MfrZePejqOpCLOPWy6xdV8INAhNnQTrE8cRy+agw4KZZ
-s2CcEk4ygrqy5j94iyXtXQtlBrjc+no3op50mx30+C2nNJul2fOokS1eL7s3Ly4G
-mH7dPKJ7o+V2Vk2C1Gf9raKw1OopJdVODQtrsh0IZWq0TYttZJSYBfTYWeY2odHf
-LbyDVJE3TTKI218pUniioQWaen0xlVeDYUGfgV7OI/igzbZQH21aL8kuvlHaEk9C
-Iia7xF75dsTZKBgvZGP5F6edseg08ZgRAgMBAAGjUTBPMC4GA1UdEQQnMCWCI2Nv
-bWFuYWdlLnRlc3RiZWQudGllci5pbnRlcm5ldDIuZWR1MB0GA1UdDgQWBBRND+Pv
-9+iGs9g1+/Qo1ek+XoulzDANBgkqhkiG9w0BAQUFAAOCAQEAqRcBmk5sPtBemUVz
-FGagyARq0qchuUCNA0AyPZJruIY9zN4x6FXThOG5lfmMHfiQvWU8TlUeHrRTwmxE
-fbFUz27GKyKblZyHG2ZbMG2lMdFRUdp5/x+UeRKu30F3rm9lpdnzUL9OO7xuJyNi
-DosFzcJYgfSdAef5RhrzBoSevZEIKMQKmz6uEyXd5nrCuMnC/N4MeWV1Ddx6EK5d
-Yq+yoXUjcagcmfaewmtt2RhdMirM9GRMdkTJN0HQOiAh81iuOMCnA5A+7Bt8pDip
-UhREPDe27PAepEtACSDSRgSh0ySCGDJhnKjbkSOHHlxX/DJeeC/fD+W/z2MeML21
-+1bAhg==
-			        </ds:X509Certificate>
-			    </ds:X509Data>
-		    </ds:KeyInfo>
-		</KeyDescriptor>
-
-		<AssertionConsumerService
-		    Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
-		    Location="https://comanage.testbed.tier.internet2.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-
-		<AssertionConsumerService
-		    Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
-		    Location="https://comanage.testbed.tier.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-
-		<AssertionConsumerService
-		    Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
-		    Location="https://comanage.testbed.tier.internet2.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-
-		<AssertionConsumerService
-		    Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS"
-		    Location="https://comanage.testbed.tier.internet2.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
-	    </SPSSODescriptor>
-
-	    <Organization>
-		<OrganizationName xml:lang="en">TIER Testbed Internet2</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">TIER Testbed Internet2</OrganizationDisplayName>
-	    </Organization>
-
-	    <ContactPerson contactType="technical">
-		<GivenName>Scott</GivenName>
-		<SurName>Koranda</SurName>
-		<EmailAddress>skoranda@sphericalcowgroup.com</EmailAddress>
-	    </ContactPerson>
-
-    </EntityDescriptor>
-
-</EntitiesDescriptor>
diff --git a/metadata/sp-testbed-tier-metadata.xml b/metadata/sp-testbed-tier-metadata.xml
deleted file mode 100644
index 279b13a..0000000
--- a/metadata/sp-testbed-tier-metadata.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor 
-    Name="https://sp-testbed.tier.internet2.edu/metdata.xml"
-    xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-    xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
-    xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-    xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-	<EntityDescriptor entityID="https://sp.testbed.tier.internet2.edu/shibboleth"
-			  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-			  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-			  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-			  xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
-			  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-	    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-		<Extensions>
-		    <idpdisc:DiscoveryResponse index="1" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.testbed.tier.internet2.edu/Shibboleth.sso/Login" />
-		</Extensions>
-
-		<KeyDescriptor>
-		    <ds:KeyInfo>
-			    <ds:X509Data>
-			        <ds:X509Certificate>
-
-MIIDHjCCAgagAwIBAgIJAKSZKHgl59eUMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-BAMTHXNwLnRlc3RiZWQudGllci5pbnRlcm5ldDIuZWR1MB4XDTE2MDQyMTEwMTY1
-MFoXDTI2MDQxOTEwMTY1MFowKDEmMCQGA1UEAxMdc3AudGVzdGJlZC50aWVyLmlu
-dGVybmV0Mi5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2yiHO
-XDG84d7V8BBCLy58/tdhfmMH2e7Nu5VL9alL5twmFpuGlYq5AskzQjfFvSdf8lXv
-tOmWTUCdUG/pk8V3aqXtWN9y+iE3DWvcvoC20PIMqk9CIao4GuElUvFpJBxwaIU9
-jryGNTWboRf4z1d7z6ESHm14wV+6QmnQTyNKSfFt0KgqmYYnoWkhBRLqNNDnwHkC
-7C3w4xHWL9EVX/fN1tqhldkbGTSMqMQOoY5BXjTlmW/I9bzw2UNjhnt7X43nHIWY
-ItKWNNoFsJFMurNvIx0WItu3mHselZq5wTlkG53KEkoYNSsxsLIRkmxbeNP7jb+m
-+HGpwDnjbBqT2FUJAgMBAAGjSzBJMCgGA1UdEQQhMB+CHXNwLnRlc3RiZWQudGll
-ci5pbnRlcm5ldDIuZWR1MB0GA1UdDgQWBBSSm8hgP5wtbZLuAPdFRQiVXKCbNjAN
-BgkqhkiG9w0BAQUFAAOCAQEAdvGYSJPhakwpIJgID8ULhRI/jpuBLcIBshmPTiTx
-YFDIc8MM4OJ1MefKc+GApxk9lyFhYmEjbf7ljvwbXpdMLSSPTouiRPHXBHiLEv+z
-Z8VSCh9elFdX95ll7Gd7J+2OvrLRDMkMSJT61NssN+p59s3V6R8WO8CPxj7qQDKR
-bTGIWWvEToZ6y0MviUZXwOCoirG7S1cLriC0v51gN/R425bbILmxLqjL0sYWAsf1
-+VoAMeOAYEhi9cwzpR+zvLXf5F+4siLiDMr1BpuENItcxTyS56YBghxyjl7HubaJ
-IJgF4ZJ7k9oh8+gGjWbt4PsKX7LI9i/m7meEkijGm1+Psg==
-
-			        </ds:X509Certificate>
-			    </ds:X509Data>
-		    </ds:KeyInfo>
-		</KeyDescriptor>
-
-		<AssertionConsumerService
-		    Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
-		    Location="https://sp.testbed.tier.internet2.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-
-		<AssertionConsumerService
-		    Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
-		    Location="https://sp.testbed.tier.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-
-		<AssertionConsumerService
-		    Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
-		    Location="https://sp.testbed.tier.internet2.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-
-		<AssertionConsumerService
-		    Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS"
-		    Location="https://sp.testbed.tier.internet2.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
-	    </SPSSODescriptor>
-
-	    <Organization>
-		<OrganizationName xml:lang="en">TIER Testbed Internet2</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">TIER Testbed Internet2</OrganizationDisplayName>
-	    </Organization>
-
-	    <ContactPerson contactType="technical">
-		<GivenName>Jim</GivenName>
-		<SurName>Jokl</SurName>
-		<EmailAddress>jaj.virginia.edu</EmailAddress>
-	    </ContactPerson>
-
-    </EntityDescriptor>
-
-</EntitiesDescriptor>