diff --git a/www/auth/login-ldapmulti.php b/www/auth/login-ldapmulti.php
index f95b29be4884d90661a9b7cfa7102063ce03928f..40ab188eda9855ebb0e71f5951f9ba116f125a6d 100644
--- a/www/auth/login-ldapmulti.php
+++ b/www/auth/login-ldapmulti.php
@@ -9,8 +9,6 @@ require_once('SimpleSAML/Logger.php');
 require_once('SimpleSAML/XML/MetaDataStore.php');
 require_once('SimpleSAML/XHTML/Template.php');
 
-session_start();
-
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);
 $session = SimpleSAML_Session::getInstance();
diff --git a/www/auth/login-radius.php b/www/auth/login-radius.php
index 990b6788b0c5d974110631462e1cab2536f623c8..47dc0efff95e2757e5b347754ce08ff445545740 100644
--- a/www/auth/login-radius.php
+++ b/www/auth/login-radius.php
@@ -8,8 +8,6 @@ require_once('SimpleSAML/Logger.php');
 require_once('SimpleSAML/XML/MetaDataStore.php');
 require_once('SimpleSAML/XHTML/Template.php');
 
-session_start();
-
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);
 $session = SimpleSAML_Session::getInstance();
diff --git a/www/auth/login.php b/www/auth/login.php
index 9cdb153820a2c4de30cb8108df509b45b2a253c6..fda493bb8efa34a8eb9a78c8e1dffb6e484e9f50 100644
--- a/www/auth/login.php
+++ b/www/auth/login.php
@@ -12,8 +12,6 @@ require_once('SimpleSAML/Bindings/SAML20/HTTPRedirect.php');
 require_once('SimpleSAML/XHTML/Template.php');
 require_once('SimpleSAML/Logger.php');
 
-session_start();
-
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);	
 $session = SimpleSAML_Session::getInstance();
diff --git a/www/example-simple/hostnames.php b/www/example-simple/hostnames.php
index cb245a23283051ff6fbf536a91b042fcf583b9fa..e3fd751a0600c735022a31b02334d7a9c568b904 100644
--- a/www/example-simple/hostnames.php
+++ b/www/example-simple/hostnames.php
@@ -11,8 +11,6 @@ require_once('SimpleSAML/Bindings/SAML20/HTTPRedirect.php');
 require_once('SimpleSAML/Bindings/SAML20/HTTPPost.php');
 require_once('SimpleSAML/XHTML/Template.php');
 
-session_start();
-
 /* Load simpleSAMLphp, configuration and metadata */
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);
diff --git a/www/example-simple/saml2-example.php b/www/example-simple/saml2-example.php
index f59bccc9bef963d24781c7d800db53bbc4ee0d72..141cd31c3f01aa2b9eda6dbb8cc0f71941a67b1b 100644
--- a/www/example-simple/saml2-example.php
+++ b/www/example-simple/saml2-example.php
@@ -12,9 +12,6 @@ require_once('SimpleSAML/Bindings/SAML20/HTTPPost.php');
 require_once('SimpleSAML/XHTML/Template.php');
 
 
-session_start();
-
-
 /* Load simpleSAMLphp, configuration and metadata */
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);
diff --git a/www/example-simple/shib13-example.php b/www/example-simple/shib13-example.php
index d16d6c686193214c58f6f3f8ba10e40c355fe5a8..7ff1810799780b34244e70d28c97299293812262 100644
--- a/www/example-simple/shib13-example.php
+++ b/www/example-simple/shib13-example.php
@@ -6,7 +6,6 @@ require_once('SimpleSAML/Utilities.php');
 require_once('SimpleSAML/Session.php');
 require_once('SimpleSAML/XML/MetaDataStore.php');
 require_once('SimpleSAML/XHTML/Template.php');
-session_start();
 
 
 $config = SimpleSAML_Configuration::getInstance();
diff --git a/www/saml2/idp/SSOService.php b/www/saml2/idp/SSOService.php
index 35d6f55ec8f48346066b2616224b6fa38145dc6e..2eeb41c5f5e84936e7e2fe5de1fb91e96d871b67 100644
--- a/www/saml2/idp/SSOService.php
+++ b/www/saml2/idp/SSOService.php
@@ -16,8 +16,6 @@ require_once('SimpleSAML/Bindings/SAML20/HTTPPost.php');
 require_once('SimpleSAML/XHTML/Template.php');
 
 
-session_start();
-
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);
 $session = SimpleSAML_Session::getInstance(true);
diff --git a/www/saml2/idp/SingleLogoutService.php b/www/saml2/idp/SingleLogoutService.php
index f797641d61387cb944919b600436d0758bd12a9a..778608e5475fb5d3f1b6bedc19906b5c3400455d 100644
--- a/www/saml2/idp/SingleLogoutService.php
+++ b/www/saml2/idp/SingleLogoutService.php
@@ -14,8 +14,6 @@ require_once('SimpleSAML/Bindings/SAML20/HTTPRedirect.php');
 require_once('SimpleSAML/XHTML/Template.php');
 
 
-session_start();
-
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);
 
diff --git a/www/saml2/idp/metadata.php b/www/saml2/idp/metadata.php
index c756cd67283f93ad302e6f112f64fc0d47d5a9e2..2ddc42b521bed685044b6e9c31b08c8a74a64fb3 100644
--- a/www/saml2/idp/metadata.php
+++ b/www/saml2/idp/metadata.php
@@ -7,8 +7,6 @@ require_once('SimpleSAML/Session.php');
 require_once('SimpleSAML/XML/MetaDataStore.php');
 require_once('SimpleSAML/XHTML/Template.php');
 
-session_start();
-
 /* Load simpleSAMLphp, configuration and metadata */
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);
diff --git a/www/saml2/sp/AssertionConsumerService.php b/www/saml2/sp/AssertionConsumerService.php
index 6a1a3f4a1bd0a4350744b3734a93b1beb1b3d005..a9dce52a3dbea46044e639408cad5d89a631a529 100644
--- a/www/saml2/sp/AssertionConsumerService.php
+++ b/www/saml2/sp/AssertionConsumerService.php
@@ -11,8 +11,6 @@ require_once('SimpleSAML/XML/SAML20/AuthnRequest.php');
 require_once('SimpleSAML/Bindings/SAML20/HTTPPost.php');
 require_once('SimpleSAML/XHTML/Template.php');
 
-session_start();
-
 $session = SimpleSAML_Session::getInstance();
 
 $logger = new SimpleSAML_Logger();
diff --git a/www/saml2/sp/SingleLogoutService.php b/www/saml2/sp/SingleLogoutService.php
index fdc99c0f4477977cb447b62b30f12637bfacf959..23d711b0b29903ef003085b7ce8013c2aad61f8c 100644
--- a/www/saml2/sp/SingleLogoutService.php
+++ b/www/saml2/sp/SingleLogoutService.php
@@ -11,8 +11,6 @@ require_once('SimpleSAML/XML/SAML20/LogoutRequest.php');
 require_once('SimpleSAML/XML/SAML20/LogoutResponse.php');
 require_once('SimpleSAML/Bindings/SAML20/HTTPPost.php');
 
-session_start();
-
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);
 
diff --git a/www/saml2/sp/idpdisco.php b/www/saml2/sp/idpdisco.php
index d7af8c2fdefc464a6623ea0609319318df627814..d95629665bb0ac7c2276ac26c1720fb08e6265b5 100644
--- a/www/saml2/sp/idpdisco.php
+++ b/www/saml2/sp/idpdisco.php
@@ -12,8 +12,6 @@ require_once('SimpleSAML/XML/SAML20/AuthnRequest.php');
 require_once('SimpleSAML/Bindings/SAML20/HTTPRedirect.php');
 //require_once('SimpleSAML/Bindings/SAML20/HTTPPost.php');
 
-session_start();
-
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);
 
diff --git a/www/saml2/sp/initSLO.php b/www/saml2/sp/initSLO.php
index 45e72ce9f4db80d093596f914ba4aea5e75f953b..33e1a178064a2ee0e80a31738e775026a85005f0 100644
--- a/www/saml2/sp/initSLO.php
+++ b/www/saml2/sp/initSLO.php
@@ -12,8 +12,6 @@ require_once('SimpleSAML/Bindings/SAML20/HTTPRedirect.php');
 
 
 
-session_start();
-
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);
 
diff --git a/www/saml2/sp/initSSO.php b/www/saml2/sp/initSSO.php
index a687ae62fc851859c90805ab1d25b1cc7291cff8..ac77f5184e814e0e0d1f0838e75c1a4fc62d852f 100644
--- a/www/saml2/sp/initSSO.php
+++ b/www/saml2/sp/initSSO.php
@@ -13,8 +13,6 @@ require_once('SimpleSAML/XML/SAML20/AuthnRequest.php');
 require_once('SimpleSAML/Bindings/SAML20/HTTPRedirect.php');
 //require_once('SimpleSAML/Bindings/SAML20/HTTPPost.php');
 
-session_start();
-
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);
 $session = SimpleSAML_Session::getInstance(true);
diff --git a/www/saml2/sp/metadata.php b/www/saml2/sp/metadata.php
index b560cd15c594c3ecef6f41afe60e5559ef0d0f17..037dbf5f9cb185c3aaadc63fab83b7e20e1a8509 100644
--- a/www/saml2/sp/metadata.php
+++ b/www/saml2/sp/metadata.php
@@ -7,8 +7,6 @@ require_once('SimpleSAML/Session.php');
 require_once('SimpleSAML/XML/MetaDataStore.php');
 require_once('SimpleSAML/XHTML/Template.php');
 
-session_start();
-
 /* Load simpleSAMLphp, configuration and metadata */
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);
diff --git a/www/shib13/idp/SSOService.php b/www/shib13/idp/SSOService.php
index b7ccdd2b0ee3a90ed04b924b5b9268267a05c921..14ec85a2592f671ecbcf4ca5c9eb446df7a0b813 100644
--- a/www/shib13/idp/SSOService.php
+++ b/www/shib13/idp/SSOService.php
@@ -15,8 +15,6 @@ require_once('SimpleSAML/Bindings/Shib13/HTTPPost.php');
 require_once('SimpleSAML/XHTML/Template.php');
 
 
-session_start();
-
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);
 
diff --git a/www/shib13/sp/AssertionConsumerService.php b/www/shib13/sp/AssertionConsumerService.php
index 0d71ddf587c372c6c7500ace2759794dd94ded53..789021d05e247ee999b8432f3d9a3047a29a937d 100644
--- a/www/shib13/sp/AssertionConsumerService.php
+++ b/www/shib13/sp/AssertionConsumerService.php
@@ -10,8 +10,6 @@ require_once('SimpleSAML/XML/Shib13/AuthnRequest.php');
 require_once('SimpleSAML/Bindings/Shib13/HTTPPost.php');
 require_once('SimpleSAML/XHTML/Template.php');
 
-session_start();
-
 try {
 	
 	/*
diff --git a/www/shib13/sp/idpdisco.php b/www/shib13/sp/idpdisco.php
index 56783dd7730446e6950a7ef9aee1f41c82d896b5..f6a2ab454a5ea7bbd1be00db99e5d78a7cac6463 100644
--- a/www/shib13/sp/idpdisco.php
+++ b/www/shib13/sp/idpdisco.php
@@ -8,8 +8,6 @@ require_once('SimpleSAML/Session.php');
 require_once('SimpleSAML/XHTML/Template.php');
 require_once('SimpleSAML/XML/MetaDataStore.php');
 
-session_start();
-
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);
 
diff --git a/www/shib13/sp/initSSO.php b/www/shib13/sp/initSSO.php
index fd7344a14f8913f350ad3c7bc6c772ff05f5b33b..d81f5771dac164760a123109d4810c9ee3551cac 100644
--- a/www/shib13/sp/initSSO.php
+++ b/www/shib13/sp/initSSO.php
@@ -12,8 +12,6 @@ require_once('SimpleSAML/XML/Shib13/AuthnRequest.php');
 //require_once('SimpleSAML/Bindings/SAML20/HTTPRedirect.php');
 //require_once('SimpleSAML/Bindings/SAML20/HTTPPost.php');
 
-session_start();
-
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);