diff --git a/www/saml2/sp/metadata.php b/www/saml2/sp/metadata.php
index 90d017392cce0e623e0ce234ed4f3490e2c164ab..12e10e1ceb5817fc321a9b192864225d12fba1f9 100644
--- a/www/saml2/sp/metadata.php
+++ b/www/saml2/sp/metadata.php
@@ -142,8 +142,6 @@ try {
 	
 
 	if (array_key_exists('output', $_REQUEST) && $_REQUEST['output'] == 'xhtml') {
-		$defaultidp = $config->getString('default-saml20-idp', NULL);
-		
 		$t = new SimpleSAML_XHTML_Template($config, 'metadata.php', 'admin');
 	
 		$t->data['header'] = 'saml20-sp';
@@ -158,9 +156,6 @@ try {
 		
 		$t->data['techemail'] = $config->getString('technicalcontact_email', NULL);
 		
-// 		$t->data['version'] = $config->getString('version', 'na');
-// 		$t->data['defaultidp'] = $defaultidp;
-		
 		$t->show();
 		
 	} else {
diff --git a/www/shib13/sp/metadata.php b/www/shib13/sp/metadata.php
index 489de92da11fbf4c6097e09dbb6f34d1c5c560bc..1133b5781108065ea284f4be9ca62dbd3e2a0de9 100644
--- a/www/shib13/sp/metadata.php
+++ b/www/shib13/sp/metadata.php
@@ -65,27 +65,12 @@ try {
 	$metaxml = SimpleSAML_Metadata_Signer::sign($metaxml, $spmeta, 'Shib 1.3 SP');
 
 	if (array_key_exists('output', $_GET) && $_GET['output'] == 'xhtml') {
-		$defaultidp = $config->getString('default-shib13-idp', NULL);
-		
 		$t = new SimpleSAML_XHTML_Template($config, 'metadata.php', 'admin');
-		
-	
 		$t->data['header'] = 'shib13-sp';
 		$t->data['metadata'] = htmlspecialchars($metaxml);
 		$t->data['metadataflat'] = htmlspecialchars($metaflat);
 		$t->data['metaurl'] = SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURLNoQuery(), array('output' => 'xml'));
-		
-		/*
-		if (array_key_exists($defaultidp, $send_metadata_to_idp)) {
-			$et->data['sendmetadatato'] = $send_metadata_to_idp[$defaultidp]['address'];
-			$et->data['federationname'] = $send_metadata_to_idp[$defaultidp]['name'];
-		}
-		*/
-	
 		$t->data['techemail'] = $config->getString('technicalcontact_email', 'na');
-		$t->data['version'] = $config->getString('version', 'na');
-		$t->data['defaultidp'] = $defaultidp;
-		
 		$t->show();
 		
 	} else {