diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageHandler.php b/lib/SimpleSAML/Metadata/MetaDataStorageHandler.php
index 7d39cc8103af1dcad6c333d1e25da7ec4af9a712..86ea16706d17fe3aeafddb860a5f3146e3566219 100644
--- a/lib/SimpleSAML/Metadata/MetaDataStorageHandler.php
+++ b/lib/SimpleSAML/Metadata/MetaDataStorageHandler.php
@@ -145,11 +145,6 @@ class SimpleSAML_Metadata_MetaDataStorageHandler {
 				case 'SingleSignOnService' : 
 					return $baseurl . 'shib13/idp/SSOService.php';			
 			}
-		} elseif($set == 'openid-provider') {
-			switch ($property) {				
-				case 'server' : 
-					return $baseurl . 'openid/provider/server.php';			
-			}
 		}
 		
 		throw new Exception('Could not generate metadata property ' . $property . ' for set ' . $set . '.');
diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php
index 6c33ec42fc7c135b5bb20852f9cdeed2cc8569dd..052dc771fdd60035fe8e81a98a7819411230ac20 100644
--- a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php
+++ b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php
@@ -18,7 +18,6 @@ class SimpleSAML_Metadata_MetaDataStorageHandlerFlatFile extends SimpleSAML_Meta
 		'saml20-sp-hosted', 'saml20-sp-remote','saml20-idp-hosted', 'saml20-idp-remote',
 		'shib13-sp-hosted', 'shib13-sp-remote', 'shib13-idp-hosted', 'shib13-idp-remote',
 		'wsfed-sp-hosted', 'wsfed-idp-remote',
-		'openid-provider'
 		);
 
 
diff --git a/metadata-templates/openid-provider.php b/metadata-templates/openid-provider.php
deleted file mode 100644
index d910701f2f4b1f8f2dfabf71fab836a13230ec92..0000000000000000000000000000000000000000
--- a/metadata-templates/openid-provider.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/* 
- * OpenID Provider configuration
- *
- */
-
-
-$metadata = array( 
-
-	// Use the hostname as the array key
-	'openidserver.example.org' => array(
-	
-		// The hostname of the server (VHOST) that this SAML entity will use.
-		'host'				=>	'openidserver.example.org',
-		
-		// Authentication plugin to use. auth/login.php is the default one that uses LDAP.
-		'auth'				=>	'saml2/sp/initSSO.php'
-	)
-
-);
-
-?>