diff --git a/config-templates/config.php b/config-templates/config.php
index e6d36b97b62940a105b7265a2144283c4bf37f18..29765249285c780502f208c4d3c4827d4390b317 100644
--- a/config-templates/config.php
+++ b/config-templates/config.php
@@ -139,9 +139,7 @@ $config = array (
 	 * one of the functionalities below, but in some cases you could run multiple functionalities.
 	 * In example when you are setting up a federation bridge.
 	 */
-	'enable.saml20-sp'		=> true,
 	'enable.saml20-idp'		=> false,
-	'enable.shib13-sp'		=> false,
 	'enable.shib13-idp'		=> false,
 	'enable.wsfed-sp'		=> false,
 	'enable.authmemcookie' => false,
diff --git a/docs/simplesamlphp-googleapps.txt b/docs/simplesamlphp-googleapps.txt
index 89a521b7bcf67d9e6e3a047491bb446c8cffc4e8..7331ebf8bf7a6dfcc7ab45990ca40ec42e3cf534 100644
--- a/docs/simplesamlphp-googleapps.txt
+++ b/docs/simplesamlphp-googleapps.txt
@@ -35,9 +35,7 @@ In this example we will setup this server as an IdP for Google Apps for Educatio
 
 Edit `config.php`, and enable the SAML 2.0 IdP:
 
-    'enable.saml20-sp'  => false,
     'enable.saml20-idp' => true,
-    'enable.shib13-sp'  => false,
     'enable.shib13-idp' => false,
 
 ## Setting up a SSL signing certificate
diff --git a/docs/simplesamlphp-idp.txt b/docs/simplesamlphp-idp.txt
index 203a96638b7d149606c948456f7a1a5e109d2b4c..f822662225c1698f6b45fb89127ea875ff0058c1 100644
--- a/docs/simplesamlphp-idp.txt
+++ b/docs/simplesamlphp-idp.txt
@@ -17,9 +17,7 @@ Enabling the Identity Provider functionality
 
 The first that must be done is to enable the identity provider functionality. This is done by editing `config/config.php`. The options `enable.saml20-idp` and `enable.shib13-idp` controls whether SAML 2.0 and Shibboleth 1.3 support is enabled. Enable one or both of those by assigning `true` to them:
 
-    'enable.saml20-sp'  => false,
     'enable.saml20-idp' => true,
-    'enable.shib13-sp'  => false,
     'enable.shib13-idp' => true,
 
 
diff --git a/metadata-templates/saml20-sp-hosted.php b/metadata-templates/saml20-sp-hosted.php
deleted file mode 100644
index 397d0e34000d64df02007923ded48fc5332009fb..0000000000000000000000000000000000000000
--- a/metadata-templates/saml20-sp-hosted.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/* 
- * SAML 2.0 Meta data for simpleSAMLphp
- *
- * The SAML 2.0 SP Hosted config is used by the SAML 2.0 SP to identify itself.
- *
- * Required fields:
- *  - host
- *
- * Optional fields:
- *  - NameIDFormat
- *  - ForceAuthn  
- *  - redirect.sign
- */
- 
-$metadata = array( 
-
-	/*
-	 * Example of a hosted SP 
-	 */
-	'__DYNAMIC:1__' => array(
-		'host'  => '__DEFAULT__'
-	)
-
-);
-
-
-?>
\ No newline at end of file
diff --git a/modules/core/www/frontpage_config.php b/modules/core/www/frontpage_config.php
index 7bd4b0462437bbb66be8f580ea5bcf34d7db6094..fd7d478b65c22bf3669655ae43e60d8eb5909275 100644
--- a/modules/core/www/frontpage_config.php
+++ b/modules/core/www/frontpage_config.php
@@ -68,9 +68,7 @@ SimpleSAML_Module::callHooks('frontpage', $allLinks);
 
 
 $enablematrix = array(
-	'saml20-sp' => $config->getBoolean('enable.saml20-sp', TRUE),
 	'saml20-idp' => $config->getBoolean('enable.saml20-idp', false),
-	'shib13-sp' => $config->getBoolean('enable.shib13-sp', false),
 	'shib13-idp' => $config->getBoolean('enable.shib13-idp', false),
 );