diff --git a/modules/core/www/frontpage_federation.php b/modules/core/www/frontpage_federation.php
index d502e7bab41f9a0a7882a2e7a955737b7b55603f..512061ed47d701afdc7469c24813e53ecbf0d63e 100644
--- a/modules/core/www/frontpage_federation.php
+++ b/modules/core/www/frontpage_federation.php
@@ -75,14 +75,6 @@ if ($isadmin) {
 	$metaentries['remote']['shib13-idp-remote'] = $metadata->getList('shib13-idp-remote');
 }
 
-if ($config->getBoolean('enable.saml20-sp', TRUE) === true) {
-	try {
-		$metaentries['hosted']['saml20-sp'] = $metadata->getMetaDataCurrent('saml20-sp-hosted');
-		$metaentries['hosted']['saml20-sp']['deprecated'] = TRUE;
-		$metaentries['hosted']['saml20-sp']['metadata-url'] = '/' . $config->getBaseURL() .
-                                                              'saml2/sp/metadata.php?output=xhtml';
-	} catch(Exception $e) {}
-}
 if ($config->getBoolean('enable.saml20-idp', FALSE) === true) {
 	try {
 		$metaentries['hosted']['saml20-idp'] = $metadata->getMetaDataCurrent('saml20-idp-hosted');
@@ -92,14 +84,6 @@ if ($config->getBoolean('enable.saml20-idp', FALSE) === true) {
 			$metaentries['remote']['saml20-sp-remote'] = $metadata->getList('saml20-sp-remote');
 	} catch(Exception $e) {}
 }
-if ($config->getBoolean('enable.shib13-sp', FALSE) === true) {
-	try {
-		$metaentries['hosted']['shib13-sp'] = $metadata->getMetaDataCurrent('shib13-sp-hosted');
-		$metaentries['hosted']['shib13-sp']['deprecated'] = TRUE;
-		$metaentries['hosted']['shib13-sp']['metadata-url'] = '/' . $config->getBaseURL() .
-                                                              'shib13/sp/metadata.php?output=xhtml';
-	} catch(Exception $e) {}
-}
 if ($config->getBoolean('enable.shib13-idp', FALSE) === true) {
 	try {
 		$metaentries['hosted']['shib13-idp'] = $metadata->getMetaDataCurrent('shib13-idp-hosted');