diff --git a/attributemap/addurnprefix.php b/attributemap/addurnprefix.php
index f06f9961d2877bd16a42ef1848e0927b2a9e4ebb..7b9bc08f1813082bdb4e1b7284279f2914918862 100644
--- a/attributemap/addurnprefix.php
+++ b/attributemap/addurnprefix.php
@@ -18,5 +18,3 @@ $attributemap = array(
 	'eduPersonOrgDN'			=> 'urn:mace:dir:attribute-def:eduPersonOrgDN',
 	'eduPersonOrgUnitDN'		=> 'urn:mace:dir:attribute-def:eduPersonOrgUnitDN',
 );
-
-?>
\ No newline at end of file
diff --git a/attributemap/feide-oid.php b/attributemap/feide-oid.php
index 30a6a9d39a118db26e77710ae1c4cbb85e1f0a78..34ee2d5e8d1a53566ca99677eefcab5f79e6a519 100644
--- a/attributemap/feide-oid.php
+++ b/attributemap/feide-oid.php
@@ -37,5 +37,3 @@ ShibMapAttribute urn:mace:switch.ch:attribute-def:swissEduPersonStudyLevel Shib-
 ShibMapAttribute urn:mace:switch.ch:attribute-def:swissEduPersonStaffCategory Shib-SwissEP-StaffCategory staffCategory
 
 */
-
-?>
\ No newline at end of file
diff --git a/attributemap/name2claim.php b/attributemap/name2claim.php
index ba32920ad92a639b60445a1fbc6df21f2a964de3..015a3d87059c200c49f2e1adcdc10345c55544ed 100644
--- a/attributemap/name2claim.php
+++ b/attributemap/name2claim.php
@@ -11,4 +11,3 @@ $attributemap = array(
 	'streetaddress' => 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/streetaddress',
 	'telephonenumber' => 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/otherphone',
 );
-?>
diff --git a/attributemap/name2oid.php b/attributemap/name2oid.php
index 5e3346869f197d80dc511706d9f0e5ed05479628..50714509c85899a51b62eac1278fa5392eae61ad 100644
--- a/attributemap/name2oid.php
+++ b/attributemap/name2oid.php
@@ -163,4 +163,3 @@ $attributemap = array(
 	'schacHomeOrganization' => 'urn:oid:1.3.6.1.4.1.25178.1.2.9',
 	'schacPersonalUniqueCode' => 'urn:oid:1.3.6.1.4.1.25178.1.2.14',
 );
-?>
\ No newline at end of file
diff --git a/attributemap/name2urn.php b/attributemap/name2urn.php
index 5ccc677c1c1442115921248c07b55679847a7dee..b9689d56e785e3df018658f42465e71d389fa267 100644
--- a/attributemap/name2urn.php
+++ b/attributemap/name2urn.php
@@ -160,4 +160,3 @@ $attributemap = array(
 	'x121Address' => 'urn:mace:dir:attribute-def:x121Address',
 	'x500UniqueIdentifier' => 'urn:mace:dir:attribute-def:x500UniqueIdentifier',
 );
-?>
\ No newline at end of file
diff --git a/attributemap/oid-feide.php b/attributemap/oid-feide.php
index 3319804dd3d8f361aa0e60ac7ef04c161fb26c8f..7d9c9d0d16c6f976e9f1d31123c4e78fa4ae04d1 100644
--- a/attributemap/oid-feide.php
+++ b/attributemap/oid-feide.php
@@ -10,5 +10,3 @@ $attributemap = array(
 	'urn:oid:2.5.4.42' => 'givenName',
 	'urn:oid:2.16.756.1.2.5.1.1.1' => 'eduPerson',
 );
-
-?>
\ No newline at end of file
diff --git a/attributemap/oid2name.php b/attributemap/oid2name.php
index cfb8133511da9b62699cc85f073b79be2fbc397f..3422d03852a9873745146a25cf5556378232be2f 100644
--- a/attributemap/oid2name.php
+++ b/attributemap/oid2name.php
@@ -142,4 +142,3 @@ $attributemap = array(
 	'urn:oid:1.3.6.1.4.1.25178.1.2.9' => 'schacHomeOrganization',
 	'urn:oid:1.3.6.1.4.1.25178.1.2.14' => 'schacPersonalUniqueCode',
 );
-?>
\ No newline at end of file
diff --git a/attributemap/oid2urn.php b/attributemap/oid2urn.php
index f32d7df201144c5a0e6d782c0aaca977d24242dd..0a15e9ed52ead8a0722a20c86c1819dc3fca85b2 100644
--- a/attributemap/oid2urn.php
+++ b/attributemap/oid2urn.php
@@ -139,4 +139,3 @@ $attributemap = array(
 	'urn:oid:2.5.4.8' => 'urn:mace:dir:attribute-def:st',
 	'urn:oid:2.5.4.9' => 'urn:mace:dir:attribute-def:street',
 );
-?>
\ No newline at end of file
diff --git a/attributemap/removeurnprefix.php b/attributemap/removeurnprefix.php
index a48ffe12bd7a5c4a3b982dba5d2b0c73325c7cfa..db9f034ff6414679d972a8d5c56ab4286e652a80 100644
--- a/attributemap/removeurnprefix.php
+++ b/attributemap/removeurnprefix.php
@@ -18,5 +18,3 @@ $attributemap = array(
 	'urn:mace:dir:attribute-def:eduPersonOrgDN' => 'eduPersonOrgDN',
 	'urn:mace:dir:attribute-def:eduPersonOrgUnitDN' => 'eduPersonOrgUnitDN',
 );
-
-?>
\ No newline at end of file
diff --git a/attributemap/test.php b/attributemap/test.php
index 41e55c9596f5f4720ccc5685f8bd06916a8e2c54..65be84dcfec038325deb79b65343be227d6f724e 100644
--- a/attributemap/test.php
+++ b/attributemap/test.php
@@ -36,5 +36,3 @@ ShibMapAttribute urn:mace:switch.ch:attribute-def:swissEduPersonStudyLevel Shib-
 ShibMapAttribute urn:mace:switch.ch:attribute-def:swissEduPersonStaffCategory Shib-SwissEP-StaffCategory staffCategory
 
 */
-
-?>
\ No newline at end of file
diff --git a/attributemap/urn2name.php b/attributemap/urn2name.php
index 1933b105e9c8f611d99d5645fe2de39a48b08e16..14d2d96aa24e1e2fc073e1854dc0ca5593ffef2b 100644
--- a/attributemap/urn2name.php
+++ b/attributemap/urn2name.php
@@ -160,4 +160,3 @@ $attributemap = array(
 	'urn:mace:dir:attribute-def:x121Address' => 'x121Address',
 	'urn:mace:dir:attribute-def:x500UniqueIdentifier' => 'x500UniqueIdentifier',
 );
-?>
\ No newline at end of file
diff --git a/attributemap/urn2oid.php b/attributemap/urn2oid.php
index 72048249576f16147e355aa0fa18e88a4f71bcc2..d8f1179eb42dc10fbdb03c3e7d1c40f5b0a3f65e 100644
--- a/attributemap/urn2oid.php
+++ b/attributemap/urn2oid.php
@@ -160,4 +160,3 @@ $attributemap = array(
 	'urn:mace:dir:attribute-def:x121Address' => 'urn:oid:2.5.4.24',
 	'urn:mace:dir:attribute-def:x500UniqueIdentifier' => 'urn:oid:2.5.4.45',
 );
-?>
\ No newline at end of file
diff --git a/bin/memcacheSync.php b/bin/memcacheSync.php
index 26c9cf7cd29247f908cc7436852a40cf35f69b21..0090f9625ef1c2ab3b881f973bf53df364d68a0f 100755
--- a/bin/memcacheSync.php
+++ b/bin/memcacheSync.php
@@ -161,5 +161,3 @@ function getServerKeys($server) {
 
 	return $keys;
 }
-
-?>
\ No newline at end of file
diff --git a/bin/translation.php b/bin/translation.php
index e07f5d52419773cbe42302b0b8624136dc74944f..0ffc820b55e25b699bc4a22f939ae13e5c6ebb4e 100755
--- a/bin/translation.php
+++ b/bin/translation.php
@@ -194,5 +194,3 @@ function json_format($data, $indentation = '') {
 
 	return $ret;
 }
-
-?>
diff --git a/config-templates/authmemcookie.php b/config-templates/authmemcookie.php
index 47509494cf7ba69a26d591e76cea93d3b5d0ffd8..b8e8df8f98a32f021dc994a48dbbbe4f885cba22 100644
--- a/config-templates/authmemcookie.php
+++ b/config-templates/authmemcookie.php
@@ -73,5 +73,3 @@ $config = array(
 	'memcache.port' => 11211,
 
 );
-
-?>
\ No newline at end of file
diff --git a/config-templates/cas-ldap.php b/config-templates/cas-ldap.php
index b60c710161043f04f0bde7d44f4dad6276cf3d7e..087ff2e66271ef14875896d59f1750b0749b2e90 100644
--- a/config-templates/cas-ldap.php
+++ b/config-templates/cas-ldap.php
@@ -36,4 +36,3 @@ $casldapconfig = array (
 	),
 
 );
-?>
\ No newline at end of file
diff --git a/config-templates/config-login-auto.php b/config-templates/config-login-auto.php
index 0248ba120c58d5a0dd00b3b969e3a8ad510fdae2..2412882f1fac26aec2490c3f6caf51cfccf5fe3f 100644
--- a/config-templates/config-login-auto.php
+++ b/config-templates/config-login-auto.php
@@ -61,6 +61,3 @@ $config = array (
 	 */
 	'auth.auto.delay_login' => 0,
 );
-
-
-?>
\ No newline at end of file
diff --git a/config-templates/config-login-feide.php b/config-templates/config-login-feide.php
index 7c437a00554fa622e793a708c47f6d7cc13506f1..9625323bacd5b14fb09d7aaccd388e3c9b92b401 100644
--- a/config-templates/config-login-feide.php
+++ b/config-templates/config-login-feide.php
@@ -35,5 +35,3 @@ $config = array (
 		),
 	),
 );
-
-?>
diff --git a/config-templates/ldap.php b/config-templates/ldap.php
index 31673128f2e9ce6f248db381f2723a9a0bd25560..0e997b6091bf49854eca80a7917b7a33445e018a 100644
--- a/config-templates/ldap.php
+++ b/config-templates/ldap.php
@@ -40,5 +40,3 @@ $config = array (
 	'auth.ldap.search.password' => NULL,
 
 );
-
-?>
diff --git a/config-templates/ldapmulti.php b/config-templates/ldapmulti.php
index fbd2e03827cb2a3a8a2f6179c3da8c79cf6441fd..e7c8b0cf8df7c37bc2325f522732fd90fe22ef17 100644
--- a/config-templates/ldapmulti.php
+++ b/config-templates/ldapmulti.php
@@ -29,5 +29,3 @@ $ldapmulti = array (
 	)
 	
 );
-
-?>
diff --git a/config-templates/translation.php b/config-templates/translation.php
index 97178e93d216495a29ffdcfed0b72377c64f6aad..8149aacf638e2077d211a431d7ccadfeed9fe07e 100644
--- a/config-templates/translation.php
+++ b/config-templates/translation.php
@@ -12,5 +12,3 @@ $config = array (
 	'secret' => '_0e29f782d295bc9782112981f654f1db58174d19d7',
 
 );
-
-?>
diff --git a/lib/SimpleSAML/Auth/LDAP.php b/lib/SimpleSAML/Auth/LDAP.php
index 2a3370efc902e76e8ae850981edeaef393fff51e..24e0a2828986e1b34313a4a728779e33371ab1ac 100644
--- a/lib/SimpleSAML/Auth/LDAP.php
+++ b/lib/SimpleSAML/Auth/LDAP.php
@@ -704,5 +704,3 @@ class SimpleSAML_Auth_LDAP {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Auth/ProcessingFilter.php b/lib/SimpleSAML/Auth/ProcessingFilter.php
index 4e4664e0ecaf03defe61d2c8cdd7460615592516..9a408428a908180f76626db852329b7e5bfeef9a 100644
--- a/lib/SimpleSAML/Auth/ProcessingFilter.php
+++ b/lib/SimpleSAML/Auth/ProcessingFilter.php
@@ -64,5 +64,3 @@ abstract class SimpleSAML_Auth_ProcessingFilter {
 	abstract public function process(&$request);
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Auth/Simple.php b/lib/SimpleSAML/Auth/Simple.php
index 26f702c92c5454e60e2289ae12f24ab42b66cea3..da0881d48dbdaea9a695a2d7e3fc480792a641e8 100644
--- a/lib/SimpleSAML/Auth/Simple.php
+++ b/lib/SimpleSAML/Auth/Simple.php
@@ -325,5 +325,3 @@ class SimpleSAML_Auth_Simple {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Auth/Source.php b/lib/SimpleSAML/Auth/Source.php
index f6da3e0fa92f2107f520c4c6bc620f9f607832de..fb90d99c8d6f4841c5022a4862bcc39161e4250a 100644
--- a/lib/SimpleSAML/Auth/Source.php
+++ b/lib/SimpleSAML/Auth/Source.php
@@ -349,5 +349,3 @@ abstract class SimpleSAML_Auth_Source {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Auth/State.php b/lib/SimpleSAML/Auth/State.php
index 3aec57179bb23fe53467bdbafee626222e595515..1fe4ebf6017b3379a05985d40e1cf44efab858a3 100644
--- a/lib/SimpleSAML/Auth/State.php
+++ b/lib/SimpleSAML/Auth/State.php
@@ -338,5 +338,3 @@ class SimpleSAML_Auth_State {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/AuthMemCookie.php b/lib/SimpleSAML/AuthMemCookie.php
index 80fd00a5048107f4de82a2fe3ecc2c392026c227..dc1348fd8cb073a3652498cf159d393a0006397e 100644
--- a/lib/SimpleSAML/AuthMemCookie.php
+++ b/lib/SimpleSAML/AuthMemCookie.php
@@ -144,5 +144,3 @@ class SimpleSAML_AuthMemCookie {
 		self::getInstance()->doLogout();
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Bindings/Shib13/HTTPPost.php b/lib/SimpleSAML/Bindings/Shib13/HTTPPost.php
index 945206047bf98ed2113c50f670b01efe0b3ea161..f9f5d8afc734c2db4563afc285465d883ac9b903 100644
--- a/lib/SimpleSAML/Bindings/Shib13/HTTPPost.php
+++ b/lib/SimpleSAML/Bindings/Shib13/HTTPPost.php
@@ -119,4 +119,3 @@ class SimpleSAML_Bindings_Shib13_HTTPPost {
 
 }
 
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Error/AuthSource.php b/lib/SimpleSAML/Error/AuthSource.php
index efcd5f5b60179844d276d25298fcf3617d4c205f..0dda8ad8b3929d4cf0fe421928c6cc927c0b106b 100644
--- a/lib/SimpleSAML/Error/AuthSource.php
+++ b/lib/SimpleSAML/Error/AuthSource.php
@@ -64,5 +64,3 @@ class SimpleSAML_Error_AuthSource extends SimpleSAML_Error_Error {
 
 	
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Error/BadUserInnput.php b/lib/SimpleSAML/Error/BadUserInnput.php
index 40891e8386cae06e70a97ef454036d023bcf8842..aa0b8e064d09129d6b24b9995e4b7021ca6075e2 100644
--- a/lib/SimpleSAML/Error/BadUserInnput.php
+++ b/lib/SimpleSAML/Error/BadUserInnput.php
@@ -9,5 +9,3 @@
 class SimpleSAML_Error_BadUserInnput extends SimpleSAML_Error_User{
 	
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Error/Exception.php b/lib/SimpleSAML/Error/Exception.php
index b0dca28dd56ae6751588c0f94b14447fc3b53132..55689a27d8cbcf149708bfa4eb1d73f6ec9d2faa 100644
--- a/lib/SimpleSAML/Error/Exception.php
+++ b/lib/SimpleSAML/Error/Exception.php
@@ -244,5 +244,3 @@ class SimpleSAML_Error_Exception extends Exception {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Error/InvalidCredential.php b/lib/SimpleSAML/Error/InvalidCredential.php
index 9b2160a53db19a0b905de50b2f5e4cb4ecb595a0..00b9750316e157ad8d5a283ec39995e4af1044f6 100644
--- a/lib/SimpleSAML/Error/InvalidCredential.php
+++ b/lib/SimpleSAML/Error/InvalidCredential.php
@@ -9,5 +9,3 @@
 class SimpleSAML_Error_InvalidCredential extends SimpleSAML_Error_User{
 	
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Error/NoPassive.php b/lib/SimpleSAML/Error/NoPassive.php
index 860833d14b1edd628e00b02e2aa1b9e3431eba4a..73b5cd833a1604c11918e322c5a7e59f04e483e1 100644
--- a/lib/SimpleSAML/Error/NoPassive.php
+++ b/lib/SimpleSAML/Error/NoPassive.php
@@ -4,5 +4,3 @@
 class SimpleSAML_Error_NoPassive extends SimpleSAML_Error_Exception {
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Error/ProxyCountExceeded.php b/lib/SimpleSAML/Error/ProxyCountExceeded.php
index 624a1f8ffd7c38770ba95ed205df260889bda432..bebe09321aa221b8f6987f0090ed139d57ce3aea 100644
--- a/lib/SimpleSAML/Error/ProxyCountExceeded.php
+++ b/lib/SimpleSAML/Error/ProxyCountExceeded.php
@@ -4,5 +4,3 @@
 class SimpleSAML_Error_ProxyCountExceeded extends SimpleSAML_Error_Exception {
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Error/User.php b/lib/SimpleSAML/Error/User.php
index e46c7c6d7570ee9353ea53616ad1ecacbc9279d5..c915790c2c958a1c71b526d43af79188b88ad01c 100644
--- a/lib/SimpleSAML/Error/User.php
+++ b/lib/SimpleSAML/Error/User.php
@@ -11,5 +11,3 @@
 class SimpleSAML_Error_User extends SimpleSAML_Error_Exception{
 	
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Error/UserNotFound.php b/lib/SimpleSAML/Error/UserNotFound.php
index 557fdc356697d1c66b32e8cf236a68194bfef2d3..e8b3ed0396f0f04e81db9377d1ac2d8a638d4d1a 100644
--- a/lib/SimpleSAML/Error/UserNotFound.php
+++ b/lib/SimpleSAML/Error/UserNotFound.php
@@ -10,5 +10,3 @@
 class SimpleSAML_Error_UserNotFound extends SimpleSAML_Error_User{
 	
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Memcache.php b/lib/SimpleSAML/Memcache.php
index 60d55a1ba189f7a16b24d34cead873dd8b72cfb0..33d458457ba4b65c3ca03e9ae0678d12cd18a9b5 100644
--- a/lib/SimpleSAML/Memcache.php
+++ b/lib/SimpleSAML/Memcache.php
@@ -430,4 +430,3 @@ class SimpleSAML_Memcache {
 	}
 
 }
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php
index 6281314a9d72fa2e3203fe866fb4954f58bc259f..22688c297bcc67acfcbf41ee971f038c37722e8e 100644
--- a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php
+++ b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php
@@ -133,5 +133,3 @@ class SimpleSAML_Metadata_MetaDataStorageHandlerFlatFile extends SimpleSAML_Meta
 
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerSerialize.php b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerSerialize.php
index 4cc25f53118a56fa8b5fbf65fa3fbffb42cc9fb0..3415cd5cc0feb504e147cb08457e4063ad76d0f2 100644
--- a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerSerialize.php
+++ b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerSerialize.php
@@ -254,5 +254,3 @@ class SimpleSAML_Metadata_MetaDataStorageHandlerSerialize extends SimpleSAML_Met
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerXML.php b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerXML.php
index 96a2682241e9998670c307a86953ff016a12a4fd..9cfdb0c87f07b6ee7ae2d666383830f8d251d518 100644
--- a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerXML.php
+++ b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerXML.php
@@ -100,5 +100,3 @@ class SimpleSAML_Metadata_MetaDataStorageHandlerXML extends SimpleSAML_Metadata_
 		return array();
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageSource.php b/lib/SimpleSAML/Metadata/MetaDataStorageSource.php
index 5a4ebf23861fe078a23e43f1a9265aef2153a489..076271f420b39446ef136c9f8aa47c162624f2b7 100644
--- a/lib/SimpleSAML/Metadata/MetaDataStorageSource.php
+++ b/lib/SimpleSAML/Metadata/MetaDataStorageSource.php
@@ -223,4 +223,3 @@ abstract class SimpleSAML_Metadata_MetaDataStorageSource {
 	}
 
 }
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Metadata/Signer.php b/lib/SimpleSAML/Metadata/Signer.php
index 5d595912eedc9f2cdd0165cd9dcec1d31fb7e40d..51c29d315a87089f52f8f5576e44b5cd23beeb99 100644
--- a/lib/SimpleSAML/Metadata/Signer.php
+++ b/lib/SimpleSAML/Metadata/Signer.php
@@ -197,5 +197,3 @@ class SimpleSAML_Metadata_Signer {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/Module.php b/lib/SimpleSAML/Module.php
index 78683f305b0edb577793df232c2202787bea13cb..b5d8f0245c6fc69490f3c971c4479ce2e2ade3c1 100644
--- a/lib/SimpleSAML/Module.php
+++ b/lib/SimpleSAML/Module.php
@@ -196,5 +196,3 @@ class SimpleSAML_Module {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/XHTML/EMail.php b/lib/SimpleSAML/XHTML/EMail.php
index 275295ade5373f5fd0bd9fc34f8e193b22ceb05f..67989b1210063b8a914f44e1ab75446a157e2526 100644
--- a/lib/SimpleSAML/XHTML/EMail.php
+++ b/lib/SimpleSAML/XHTML/EMail.php
@@ -97,5 +97,3 @@ Content-Transfer-Encoding: 8bit
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/XHTML/IdPDisco.php b/lib/SimpleSAML/XHTML/IdPDisco.php
index 30c66da5d7433a7d4282b4bc22329ee69aa91a96..87e7db3d3fe9ce0cc66109a1dde935f7eddb52c3 100644
--- a/lib/SimpleSAML/XHTML/IdPDisco.php
+++ b/lib/SimpleSAML/XHTML/IdPDisco.php
@@ -528,5 +528,3 @@ class SimpleSAML_XHTML_IdPDisco {
 		$t->show();
 	}
 }
-
-?>
diff --git a/lib/SimpleSAML/XHTML/Template.php b/lib/SimpleSAML/XHTML/Template.php
index 667033a72d077b193ce27e22e6dfb23512e03308..4186eb97fc373d4d6676f63d87db870856914170 100644
--- a/lib/SimpleSAML/XHTML/Template.php
+++ b/lib/SimpleSAML/XHTML/Template.php
@@ -716,5 +716,3 @@ class SimpleSAML_XHTML_Template {
 	}
 
 }
-
-?>
diff --git a/lib/SimpleSAML/XML/Errors.php b/lib/SimpleSAML/XML/Errors.php
index ed6cbd31f68ca9d57ceb02b97c6210eaa858c1a1..bc2a06c0069bc8e5ff28dafad9b5a89c1617f33e 100644
--- a/lib/SimpleSAML/XML/Errors.php
+++ b/lib/SimpleSAML/XML/Errors.php
@@ -130,5 +130,3 @@ class SimpleSAML_XML_Errors {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/XML/Parser.php b/lib/SimpleSAML/XML/Parser.php
index 65a509132ca6d7f4f79236275170067ee9ae5da9..b3096660c3340647e108bdf509559134eae28d9c 100644
--- a/lib/SimpleSAML/XML/Parser.php
+++ b/lib/SimpleSAML/XML/Parser.php
@@ -65,5 +65,3 @@ class SimpleSAML_XML_Parser  {
 	}
 	
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/XML/Shib13/AuthnRequest.php b/lib/SimpleSAML/XML/Shib13/AuthnRequest.php
index 651b87512fb7440862e4a9055aa0efeed582b291..0d91446b16bf9147dde0f3bfc1697e82c92a870b 100644
--- a/lib/SimpleSAML/XML/Shib13/AuthnRequest.php
+++ b/lib/SimpleSAML/XML/Shib13/AuthnRequest.php
@@ -44,5 +44,3 @@ class SimpleSAML_XML_Shib13_AuthnRequest {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/XML/Shib13/AuthnResponse.php b/lib/SimpleSAML/XML/Shib13/AuthnResponse.php
index 1296cb27177460666f4c98bdbeaac61814187549..12e6c6dcfb6d56fde4507c772ee2cccb57b2430a 100644
--- a/lib/SimpleSAML/XML/Shib13/AuthnResponse.php
+++ b/lib/SimpleSAML/XML/Shib13/AuthnResponse.php
@@ -429,4 +429,3 @@ class SimpleSAML_XML_Shib13_AuthnResponse {
 
 }
 
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/XML/Signer.php b/lib/SimpleSAML/XML/Signer.php
index 7c569033d8d798b5f5309a8254e21cd649990d97..15bf719e4b9d11cd840a81276d32c468b2bb0a48 100644
--- a/lib/SimpleSAML/XML/Signer.php
+++ b/lib/SimpleSAML/XML/Signer.php
@@ -266,5 +266,3 @@ class SimpleSAML_XML_Signer {
 		$objXMLSecDSig->insertSignature($insertInto, $insertBefore);
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/XML/Validator.php b/lib/SimpleSAML/XML/Validator.php
index 50876ebc44dfe0ccba4ee3329eabfe17ebedce23..c9736363bc1d201e8e531df5db8d91a7f3918888 100644
--- a/lib/SimpleSAML/XML/Validator.php
+++ b/lib/SimpleSAML/XML/Validator.php
@@ -293,5 +293,3 @@ class SimpleSAML_XML_Validator {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/log/_placeholder.php b/log/_placeholder.php
index 3af98a1abfa352ff904245ffd67e96c06b741ad1..67c9ac072b913e04b74993f706c165c3daef819e 100644
--- a/log/_placeholder.php
+++ b/log/_placeholder.php
@@ -1,3 +1,2 @@
 <?php
 /* this file can be deleted */
-?>
\ No newline at end of file
diff --git a/metadata-templates/adfs-idp-hosted.php b/metadata-templates/adfs-idp-hosted.php
index 4360c04ceea7e8729a60277029c53d382b840b85..cace17d0c556a4d1d7d1d93de86fc06bb5e91527 100644
--- a/metadata-templates/adfs-idp-hosted.php
+++ b/metadata-templates/adfs-idp-hosted.php
@@ -10,5 +10,3 @@ $metadata['__DYNAMIC:1__'] = array(
 		100 => array('class' => 'core:AttributeMap', 'name2claim'),
 	),
 );
-
-?>
diff --git a/metadata-templates/adfs-sp-remote.php b/metadata-templates/adfs-sp-remote.php
index 373a6689f58f360984df0cee71a95e90284bcb1f..8b627ee4b36e706f8cb6e59eb698be59d05bc409 100644
--- a/metadata-templates/adfs-sp-remote.php
+++ b/metadata-templates/adfs-sp-remote.php
@@ -10,5 +10,3 @@ $metadata['urn:federation:localhost'] = array(
 		),
 	),
 );
-
-?>
diff --git a/modules/InfoCard/config-template/config-login-infocard.php b/modules/InfoCard/config-template/config-login-infocard.php
index 3259851ef15b0e6bb31d70f856e653b2eef8f9fc..fd6154a3957c229d37d7ec5920abc963a5e1eb43 100644
--- a/modules/InfoCard/config-template/config-login-infocard.php
+++ b/modules/InfoCard/config-template/config-login-infocard.php
@@ -198,6 +198,3 @@ $config = array (
 	'debugDir' => '/tmp',
 
 );
- 
-
-?>
\ No newline at end of file
diff --git a/modules/InfoCard/dictionaries/dict-InfoCard.php b/modules/InfoCard/dictionaries/dict-InfoCard.php
index 82d6f7a070fa7b7604c9a73b5da15559386fe492..f5c8171e03523cffb71179e66a4273d9f75184d6 100644
--- a/modules/InfoCard/dictionaries/dict-InfoCard.php
+++ b/modules/InfoCard/dictionaries/dict-InfoCard.php
@@ -451,6 +451,3 @@ $lang = array(
 	),
 
 );
-
-
-?>
\ No newline at end of file
diff --git a/modules/InfoCard/lib/Auth/Source/ICAuth.php b/modules/InfoCard/lib/Auth/Source/ICAuth.php
index bfefdabfcb5b6e172a19879999ca1017e7b77e0a..83aafb348f8e0b27cdc9ae55b2686f785d090f4c 100644
--- a/modules/InfoCard/lib/Auth/Source/ICAuth.php
+++ b/modules/InfoCard/lib/Auth/Source/ICAuth.php
@@ -94,5 +94,3 @@ class sspmod_InfoCard_Auth_Source_ICAuth extends SimpleSAML_Auth_Source {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/InfoCard/lib/RP/InfoCard.php b/modules/InfoCard/lib/RP/InfoCard.php
index 8cc7fb80012c27f0cc4f5d68989b40864cd5d661..d0515110b4cd3e67fee9e48c1a0c8993468c220b 100644
--- a/modules/InfoCard/lib/RP/InfoCard.php
+++ b/modules/InfoCard/lib/RP/InfoCard.php
@@ -345,5 +345,3 @@ SimpleSAML_Logger::debug('IC: secureToken');
     return $decrypted;
   }
 }
-
-?>
diff --git a/modules/InfoCard/lib/STS.php b/modules/InfoCard/lib/STS.php
index 0ba0e14dce6951bd8cb4c6f95e0327dd56fab997..4f14c8555c42aa499d71f887a5b65ad01a3a6273 100644
--- a/modules/InfoCard/lib/STS.php
+++ b/modules/InfoCard/lib/STS.php
@@ -380,5 +380,3 @@ class sspmod_InfoCard_STS {
 	
 
 }
-
-?>
diff --git a/modules/InfoCard/lib/UserFunctions.php b/modules/InfoCard/lib/UserFunctions.php
index 73b8da64abb5c8140140364d85e218712229deba..e9a5229201b702c94c9cb41ea0cc0dc5504d3320 100644
--- a/modules/InfoCard/lib/UserFunctions.php
+++ b/modules/InfoCard/lib/UserFunctions.php
@@ -110,4 +110,3 @@ class sspmod_InfoCard_UserFunctions {
 	}
 
 }
-?>
\ No newline at end of file
diff --git a/modules/InfoCard/lib/Utils.php b/modules/InfoCard/lib/Utils.php
index 0df026495221018607692fbb4cac0ae6a5fbca51..1119349fb75a520576dc7625b9f2c2ea9192a283 100644
--- a/modules/InfoCard/lib/Utils.php
+++ b/modules/InfoCard/lib/Utils.php
@@ -105,4 +105,3 @@ class sspmod_InfoCard_Utils {
 
 
 }
-?>
\ No newline at end of file
diff --git a/modules/InfoCard/templates/temp-getcardform.php b/modules/InfoCard/templates/temp-getcardform.php
index f2bcf4031cb94d94d1628b7a63370ce67b9410d8..70d31c27130d42ae0627f15730f690f933905609 100644
--- a/modules/InfoCard/templates/temp-getcardform.php
+++ b/modules/InfoCard/templates/temp-getcardform.php
@@ -66,4 +66,4 @@
 			echo "<p><a href='".$this->data['help_desk_email_URL']."'>".$this->t('help_desk_email')."</a></p>";
 	?>
 	
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?> 
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/InfoCard/templates/temp-login.php b/modules/InfoCard/templates/temp-login.php
index 099e61a9429e5141b61cbaedda9ed1228c824852..407830b7a3c4a01839ba28e6a5bd25128b103159 100644
--- a/modules/InfoCard/templates/temp-login.php
+++ b/modules/InfoCard/templates/temp-login.php
@@ -79,4 +79,4 @@
 			echo "<p><a href='".$this->data['help_desk_email_URL']."'>".$this->t('help_desk_email')."</a></p>";
 	?>
 	
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/InfoCard/www/STS_card_issuer.php b/modules/InfoCard/www/STS_card_issuer.php
index 8847f5bdb9d3d375e840204ab486be3e402d10ce..dcd9015208f4ddce3b9a0aea6456f64115facfcb 100644
--- a/modules/InfoCard/www/STS_card_issuer.php
+++ b/modules/InfoCard/www/STS_card_issuer.php
@@ -283,6 +283,3 @@ if ( (strcmp($_GET['ident'],'RADIUS')==0) && (($configuredIP == null) || ($_SERV
 		throw new SimpleSAML_Error_NotFound('The URL wasn\'t found in the module.');
 	}
 }
-
-
-?>
diff --git a/modules/InfoCard/www/getcardform.php b/modules/InfoCard/www/getcardform.php
index 76f4690c332ffbe74f0e58c7c755d34f5884a61e..bcc4546d463551c10120ddd017c913176821e603 100644
--- a/modules/InfoCard/www/getcardform.php
+++ b/modules/InfoCard/www/getcardform.php
@@ -150,4 +150,3 @@ $t->data['password']=$password;
 
 $t->show();
 exit();
-?>
\ No newline at end of file
diff --git a/modules/InfoCard/www/login-infocard.php b/modules/InfoCard/www/login-infocard.php
index 97a399b5e707742a4a6ef542a89eb91b343ad7a7..d34c369933890a33c2826085cc99e28e03c671fc 100644
--- a/modules/InfoCard/www/login-infocard.php
+++ b/modules/InfoCard/www/login-infocard.php
@@ -61,4 +61,3 @@ $t->data['contact_info_URL'] = $contact_info_URL;
 $t->data['error'] = $error;
 $t->show();
 exit();
-?>
diff --git a/modules/InfoCard/www/mex.php b/modules/InfoCard/www/mex.php
index 43c6554c63899d587a37af19fde6b8c94bb2dc0c..030b8b8d9aaeed4a7a865addfeb1097be4d44b7e 100644
--- a/modules/InfoCard/www/mex.php
+++ b/modules/InfoCard/www/mex.php
@@ -240,18 +240,3 @@ $buf .= '</S:Envelope>';
 
 
 print($buf);
-
-?>
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/InfoCard/www/prueba.php b/modules/InfoCard/www/prueba.php
index 34b8d27d416b554d0420002289254aa056120024..6d38edb390eb93eb696a455267ce5b0e0b8bac8f 100644
--- a/modules/InfoCard/www/prueba.php
+++ b/modules/InfoCard/www/prueba.php
@@ -158,5 +158,4 @@ pg_close($dbconn);
 //  print base64_encode(calculate_PPID('urn:uuid:bbe3ecf5-900b-d249-b9a7-e7c261fdf189', $certificates));
 // 
 // // 	print base64_encode(pack('H*','0939625DA3A93E44F52D72AE4246EE54DE265D84'));
-//  	
-?>
+//
diff --git a/modules/InfoCard/www/tokenservice.php b/modules/InfoCard/www/tokenservice.php
index 081ac21b694fde73e8ce870f4eb452c9227d7ea4..413d093a82383818d8b4498315c8c009860c8c55 100644
--- a/modules/InfoCard/www/tokenservice.php
+++ b/modules/InfoCard/www/tokenservice.php
@@ -134,6 +134,3 @@ if ($debugDir!=null){
 	fwrite($handle,$response);
 	fclose($handle);
 }
-
-
-?>
\ No newline at end of file
diff --git a/modules/InfoCard/www/x509.php b/modules/InfoCard/www/x509.php
index 2b9416a7c0d083c20f2e03eb9d86f2d28a48bdf3..50b1d5c43289324ae13a1a581315f8d472398a2b 100644
--- a/modules/InfoCard/www/x509.php
+++ b/modules/InfoCard/www/x509.php
@@ -2,5 +2,3 @@
 <?php
 
 print 'x509';
-
-?>
\ No newline at end of file
diff --git a/modules/adfs/www/idp/prp.php b/modules/adfs/www/idp/prp.php
index 3bfc076d8430f49c2a84d175840040c3f031f0fc..b11c956371dba5595f7260801e41665863558650 100644
--- a/modules/adfs/www/idp/prp.php
+++ b/modules/adfs/www/idp/prp.php
@@ -26,5 +26,3 @@ if (isset($_GET['wa'])) {
 	$logoutError = NULL; /* NULL on success, or an instance of a SimpleSAML_Error_Exception on failure. */
 	$idp->handleLogoutResponse($assocId, $relayState, $logoutError);
 }
-
-?>
diff --git a/modules/authX509/templates/X509error.php b/modules/authX509/templates/X509error.php
index 96b93046c9365f6cb9409f16f4a0b5c926901985..90e2dbd54ab47267864704d31986b166ade98534 100644
--- a/modules/authX509/templates/X509error.php
+++ b/modules/authX509/templates/X509error.php
@@ -39,4 +39,3 @@ if(!empty($this->data['links'])) {
 
 
 $this->includeAtTemplateBase('includes/footer.php');
-?>
diff --git a/modules/authYubiKey/lib/Auth/Process/OTP2YubiPrefix.php b/modules/authYubiKey/lib/Auth/Process/OTP2YubiPrefix.php
index 3c98e9ee2aa0c9d9f8e72ecd25950804cad1828b..0527fb7ac53fd763326357d21f1892936e70b5c4 100644
--- a/modules/authYubiKey/lib/Auth/Process/OTP2YubiPrefix.php
+++ b/modules/authYubiKey/lib/Auth/Process/OTP2YubiPrefix.php
@@ -74,5 +74,3 @@ class sspmod_authYubiKey_Auth_Process_OTP2YubiPrefix extends SimpleSAML_Auth_Pro
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/authYubiKey/lib/Auth/Source/YubiKey.php b/modules/authYubiKey/lib/Auth/Source/YubiKey.php
index 07482dbc41f68f580fd00b6b0666c1c4b41e4795..a6227c0602e50d42a1b783782513989feefd3d1d 100644
--- a/modules/authYubiKey/lib/Auth/Source/YubiKey.php
+++ b/modules/authYubiKey/lib/Auth/Source/YubiKey.php
@@ -207,5 +207,3 @@ class sspmod_authYubiKey_Auth_Source_YubiKey extends SimpleSAML_Auth_Source {
 	}
 
 }
-
-?>
diff --git a/modules/authYubiKey/libextinc/Yubico.php b/modules/authYubiKey/libextinc/Yubico.php
index 67e4374cf1d1f17bd0ee2340ca92a090e6393b3b..9cdd51cb0d03abb53aede6439337c79683ba0536 100644
--- a/modules/authYubiKey/libextinc/Yubico.php
+++ b/modules/authYubiKey/libextinc/Yubico.php
@@ -160,4 +160,3 @@ class Auth_Yubico
 		return true;
 	}
 }
-?>
diff --git a/modules/authYubiKey/templates/yubikeylogin.php b/modules/authYubiKey/templates/yubikeylogin.php
index eb3dce691c4cc7ffca6c417e4a5933ab12a77f0d..72e805d8039e68b993881f3b67b51e113492fbb8 100644
--- a/modules/authYubiKey/templates/yubikeylogin.php
+++ b/modules/authYubiKey/templates/yubikeylogin.php
@@ -45,4 +45,3 @@ foreach ($this->data['stateparams'] as $name => $value) {
 <?php
 
 $this->includeAtTemplateBase('includes/footer.php');
-?>
\ No newline at end of file
diff --git a/modules/authYubiKey/www/yubikeylogin.php b/modules/authYubiKey/www/yubikeylogin.php
index fd6e0a70f5b1258229277a7000898808a0e987b6..09c2796da6c79135d10bd5bd36ee8029728e0942 100644
--- a/modules/authYubiKey/www/yubikeylogin.php
+++ b/modules/authYubiKey/www/yubikeylogin.php
@@ -33,6 +33,3 @@ $t->data['stateparams'] = array('AuthState' => $authStateId);
 $t->data['errorcode'] = $errorCode;
 $t->show();
 exit();
-
-
-?>
\ No newline at end of file
diff --git a/modules/authfacebook/lib/Auth/Source/Facebook.php b/modules/authfacebook/lib/Auth/Source/Facebook.php
index 72696c813d42236c5edc502bb40a50393df3c9ec..7e6b9525e95554b3d73d4842ac74c241f30d5d33 100644
--- a/modules/authfacebook/lib/Auth/Source/Facebook.php
+++ b/modules/authfacebook/lib/Auth/Source/Facebook.php
@@ -125,5 +125,3 @@ class sspmod_authfacebook_Auth_Source_Facebook extends SimpleSAML_Auth_Source {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/authfacebook/www/linkback.php b/modules/authfacebook/www/linkback.php
index 879e3d2225ffb89003c740eef02a6636d7cf7972..0ab3656c242014306855c9aa41e46e1878e5b4e4 100644
--- a/modules/authfacebook/www/linkback.php
+++ b/modules/authfacebook/www/linkback.php
@@ -42,5 +42,3 @@ try {
 }
 
 SimpleSAML_Auth_Source::completeAuth($state);
-
-?>
\ No newline at end of file
diff --git a/modules/authorize/lib/Auth/Process/Authorize.php b/modules/authorize/lib/Auth/Process/Authorize.php
index b73ad37a110452467ea6ecd4d2627cf29eef0c5e..2fe62922c06a7c76e67c8ec600b85f4ade2a5bc0 100644
--- a/modules/authorize/lib/Auth/Process/Authorize.php
+++ b/modules/authorize/lib/Auth/Process/Authorize.php
@@ -131,5 +131,3 @@ class sspmod_authorize_Auth_Process_Authorize extends SimpleSAML_Auth_Processing
 		SimpleSAML_Utilities::redirectTrustedURL($url, array('StateId' => $id));
 	}
 }
-
-?>
diff --git a/modules/authorize/templates/authorize_403.php b/modules/authorize/templates/authorize_403.php
index fa947d71beb0cba0777b117279afef7c1a1924ac..7aee2b8aa00a5947c46c6d4e3d139c676bb40ef4 100644
--- a/modules/authorize/templates/authorize_403.php
+++ b/modules/authorize/templates/authorize_403.php
@@ -26,4 +26,3 @@ if (isset($this->data['LogoutURL'])) {
 ?>
 <?php
 $this->includeAtTemplateBase('includes/footer.php');
-?>
diff --git a/modules/authorize/www/authorize_403.php b/modules/authorize/www/authorize_403.php
index 330b235001f42123bc9b43120e957aea6a50041d..4342e0a6aa5c2e1a47f0bfd86650d475890ac38b 100644
--- a/modules/authorize/www/authorize_403.php
+++ b/modules/authorize/www/authorize_403.php
@@ -26,6 +26,3 @@ if (isset($state['Source']['auth'])) {
 }
 header('HTTP/1.0 403 Forbidden');
 $t->show();
-
-
-?>
diff --git a/modules/casserver/config-templates/module_casserver.php b/modules/casserver/config-templates/module_casserver.php
index 0695bd599f85408ea6ae93f3941c2bfd1081433c..fab96fbbf4d3a5f6e3f6a65edcbd2d686c56b354 100644
--- a/modules/casserver/config-templates/module_casserver.php
+++ b/modules/casserver/config-templates/module_casserver.php
@@ -19,5 +19,3 @@ $config = array (
 	#'attributes' => TRUE, // enable transfer of attributes
 	
 );
-
-?>
diff --git a/modules/casserver/www/cas.php b/modules/casserver/www/cas.php
index 1da904b24f796cd2c6d7202fb6d3708a5d071c8e..5b9d16baddc11f77522d13488225eba77a7fe574 100644
--- a/modules/casserver/www/cas.php
+++ b/modules/casserver/www/cas.php
@@ -32,5 +32,3 @@ if (!isset($validFunctions[$function])) {
 }
 
 include($validFunctions[$function].".php");
-
-?>
diff --git a/modules/casserver/www/proxy.php b/modules/casserver/www/proxy.php
index 0d21cfd77cd3c5f507a5ba8c25fdd02d000d1826..c55f6197938e3d23a0ccc037ae21063cf9ca03e8 100644
--- a/modules/casserver/www/proxy.php
+++ b/modules/casserver/www/proxy.php
@@ -51,5 +51,3 @@ print <<<eox
 </cas:serviceResponse>
 eox;
 }
-
-?>
\ No newline at end of file
diff --git a/modules/casserver/www/serviceValidate.php b/modules/casserver/www/serviceValidate.php
index b3b5c7256406f8913cb91ad2819e5ac669e068df..71e9fdce893138a6809284741cdbb9671411cccf 100644
--- a/modules/casserver/www/serviceValidate.php
+++ b/modules/casserver/www/serviceValidate.php
@@ -97,5 +97,3 @@ function returnResponse($value, $function, $usrname = '', $attributes = array(),
 		}
 	}
 }
-
-?>
diff --git a/modules/casserver/www/tickets.php b/modules/casserver/www/tickets.php
index 165bcc77cebbe5405b2ecba3642e507528e9ba92..79498b1082d85769d1db6fe8cd945e7aa6190467 100644
--- a/modules/casserver/www/tickets.php
+++ b/modules/casserver/www/tickets.php
@@ -39,5 +39,3 @@ function checkServiceURL($service, array $legal_service_urls) {
 	}
 	return FALSE;
 }
-
-?>
\ No newline at end of file
diff --git a/modules/casserver/www/validate.php b/modules/casserver/www/validate.php
index e9ac026806569396a90c34e4dc634aeff8949475..b57c744693a9c4f34abacc5f91ae87153296a480 100644
--- a/modules/casserver/www/validate.php
+++ b/modules/casserver/www/validate.php
@@ -1,4 +1,3 @@
 <?php
 $function = 'validate';
 include("serviceValidate.php");
-?>
\ No newline at end of file
diff --git a/modules/consent/dictionaries/consent.php b/modules/consent/dictionaries/consent.php
index 0911725121225582663470b8357be71c7e39ff32..34c63552de790ec41200d5caa3012d134dbd27dd 100644
--- a/modules/consent/dictionaries/consent.php
+++ b/modules/consent/dictionaries/consent.php
@@ -386,6 +386,3 @@ $lang = array(
 	),
 
 );
-
-
-?>
\ No newline at end of file
diff --git a/modules/consentAdmin/hooks/hook_frontpage.php b/modules/consentAdmin/hooks/hook_frontpage.php
index a87fb1e07522ed4a8a2552a1314d4544e5c8cdf7..8be7bc163c73fdeae211dddd0bc11f81227f2fa6 100644
--- a/modules/consentAdmin/hooks/hook_frontpage.php
+++ b/modules/consentAdmin/hooks/hook_frontpage.php
@@ -13,4 +13,3 @@ function consentAdmin_hook_frontpage(&$links) {
 		'text' => '{consentAdmin:consentadmin:consentadmin_header}',
 	);
 }
-?>
diff --git a/modules/consentAdmin/templates/consentadmin.php b/modules/consentAdmin/templates/consentadmin.php
index 31075be1e06ac40ee2f8db5c0002e304d1bd1c57..a07cd2286e51a6702278e3dbcbff42fe904adc93 100644
--- a/modules/consentAdmin/templates/consentadmin.php
+++ b/modules/consentAdmin/templates/consentadmin.php
@@ -134,4 +134,4 @@ TRSTART;
 
 			<p><a href="<?php echo SimpleSAML_Utilities::selfURL() . '?logout'; ?>">Logout</a></p>
 		
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/consentAdmin/templates/consentadminajax.php b/modules/consentAdmin/templates/consentadminajax.php
index 6897ad1725c51bb062f124149626a88391717838..6055428960b6ee18ab6ebab76a6d426957d16ea4 100644
--- a/modules/consentAdmin/templates/consentadminajax.php
+++ b/modules/consentAdmin/templates/consentadminajax.php
@@ -1,3 +1,2 @@
 <?php 
 print $this->t($this->data['res']);
-?>
diff --git a/modules/consentAdmin/www/consentAdmin.php b/modules/consentAdmin/www/consentAdmin.php
index 34ef2221afa1507ff8de264fe91c46307591d4cb..efc2c19688850636dc1fb9e4ff2f858e1bb3679e 100644
--- a/modules/consentAdmin/www/consentAdmin.php
+++ b/modules/consentAdmin/www/consentAdmin.php
@@ -263,4 +263,3 @@ $et->data['header'] = 'Consent Administration';
 $et->data['spList'] = $sp_list;
 $et->data['showDescription'] = $cA_config->getValue('showDescription');
 $et->show();
-?>
diff --git a/modules/consentSimpleAdmin/hooks/hook_frontpage.php b/modules/consentSimpleAdmin/hooks/hook_frontpage.php
index 432fdcb36764a72417c5cd498ae2439bce013421..0c3658ce98d3428b37a70cf1dcde28dd2de6227a 100644
--- a/modules/consentSimpleAdmin/hooks/hook_frontpage.php
+++ b/modules/consentSimpleAdmin/hooks/hook_frontpage.php
@@ -18,6 +18,3 @@ function consentSimpleAdmin_hook_frontpage(&$links) {
 	);
 	
 }
-
-
-?>
diff --git a/modules/consentSimpleAdmin/hooks/hook_sanitycheck.php b/modules/consentSimpleAdmin/hooks/hook_sanitycheck.php
index 1cd997b38431c379a361db16cb05382641997985..5f829c8d0e37c05341adc5869cb5f7ddbd124215 100644
--- a/modules/consentSimpleAdmin/hooks/hook_sanitycheck.php
+++ b/modules/consentSimpleAdmin/hooks/hook_sanitycheck.php
@@ -30,4 +30,3 @@ function consentSimpleAdmin_hook_sanitycheck(&$hookinfo) {
 	}
 	
 }
-?>
\ No newline at end of file
diff --git a/modules/consentSimpleAdmin/templates/consentadmin.php b/modules/consentSimpleAdmin/templates/consentadmin.php
index 3bf4c727c9fb9fdfd3bffbb6bba9b8ad54b97794..a19f6dfe4249756211077486f874a3eeac5c4fe2 100644
--- a/modules/consentSimpleAdmin/templates/consentadmin.php
+++ b/modules/consentSimpleAdmin/templates/consentadmin.php
@@ -31,4 +31,4 @@ echo '<p>' . $this->t('{consentSimpleAdmin:consentsimpleadmin:info}') . '</p>';
 </form>
 <!--  Withdraw all consent given -->
 
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/consentSimpleAdmin/templates/consentstats.php b/modules/consentSimpleAdmin/templates/consentstats.php
index 731a689f6cfe73f3df97f7453dee18c9a285bace..1c8094080cb0367e0dd9799ef02622ca58e1900a 100644
--- a/modules/consentSimpleAdmin/templates/consentstats.php
+++ b/modules/consentSimpleAdmin/templates/consentstats.php
@@ -17,4 +17,4 @@ echo '<p>' . $this->t('{consentSimpleAdmin:consentsimpleadmin:statservices}', ar
 ?></p>
 
 
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/consentSimpleAdmin/www/consentAdmin.php b/modules/consentSimpleAdmin/www/consentAdmin.php
index ed1eaad03664c716c4dc94d32daa3467a58e030a..f1c1d081628f63499fbbefc5fcdb942562dc1527 100644
--- a/modules/consentSimpleAdmin/www/consentAdmin.php
+++ b/modules/consentSimpleAdmin/www/consentAdmin.php
@@ -89,4 +89,3 @@ $t->data['consents'] = count($user_consent_list);
 
 
 $t->show();
-?>
diff --git a/modules/consentSimpleAdmin/www/consentStats.php b/modules/consentSimpleAdmin/www/consentStats.php
index 5e753f5c08c09802de2815de95faa49a79ec7b0c..92240e10b98f6423803b4bae398e4e6b196977eb 100644
--- a/modules/consentSimpleAdmin/www/consentStats.php
+++ b/modules/consentSimpleAdmin/www/consentStats.php
@@ -29,4 +29,3 @@ $t->data['stats'] = $stats;
 
 
 $t->show();
-?>
diff --git a/modules/core/hooks/hook_frontpage.php b/modules/core/hooks/hook_frontpage.php
index 54ec267cc851f69d9e1b02fb42cd9b1ac569e503..ad4922150e77682d3d5bb6afa1e88160af69243a 100644
--- a/modules/core/hooks/hook_frontpage.php
+++ b/modules/core/hooks/hook_frontpage.php
@@ -30,4 +30,3 @@ function core_hook_frontpage(&$links) {
 	);
 
 }
-?>
\ No newline at end of file
diff --git a/modules/core/hooks/hook_sanitycheck.php b/modules/core/hooks/hook_sanitycheck.php
index d5b5084d7fe9cbae9aecf64dc5514c656811df11..d81ef25bca1e9c97a9db0cc74774b1c7252dda72 100644
--- a/modules/core/hooks/hook_sanitycheck.php
+++ b/modules/core/hooks/hook_sanitycheck.php
@@ -49,4 +49,3 @@ function core_hook_sanitycheck(&$hookinfo) {
 	}
 	
 }
-?>
\ No newline at end of file
diff --git a/modules/core/lib/Auth/Process/AttributeAdd.php b/modules/core/lib/Auth/Process/AttributeAdd.php
index 32a4c2e8328ec69b7524f65738c588f0b474baa9..fd3828a699751c210a4b275da4aec0b483c41751 100644
--- a/modules/core/lib/Auth/Process/AttributeAdd.php
+++ b/modules/core/lib/Auth/Process/AttributeAdd.php
@@ -87,5 +87,3 @@ class sspmod_core_Auth_Process_AttributeAdd extends SimpleSAML_Auth_ProcessingFi
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/core/lib/Auth/Process/AttributeCopy.php b/modules/core/lib/Auth/Process/AttributeCopy.php
index 73a3ca84c1118b3dbe6753737b8624e4201b50ea..8e46d976fbdcb001072e9e39742c3cfa0ff816cd 100644
--- a/modules/core/lib/Auth/Process/AttributeCopy.php
+++ b/modules/core/lib/Auth/Process/AttributeCopy.php
@@ -68,5 +68,3 @@ class sspmod_core_Auth_Process_AttributeCopy extends SimpleSAML_Auth_ProcessingF
 
 	}
 }
-
-?>
diff --git a/modules/core/lib/Auth/Process/AttributeMap.php b/modules/core/lib/Auth/Process/AttributeMap.php
index 4dda80c746add2ac266d211e9edca3fa64a9ba40..5ac7b44eaf004afe5e0cd3f9fb7ccf6d0d66ab82 100644
--- a/modules/core/lib/Auth/Process/AttributeMap.php
+++ b/modules/core/lib/Auth/Process/AttributeMap.php
@@ -118,5 +118,3 @@ class sspmod_core_Auth_Process_AttributeMap extends SimpleSAML_Auth_ProcessingFi
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/core/lib/Auth/Process/AttributeRealm.php b/modules/core/lib/Auth/Process/AttributeRealm.php
index 44479d6323d5625d1af1336c0a03ac205f8cf77f..3c5415f79d9e7dee01b4dc345d60e406b2a1ce92 100644
--- a/modules/core/lib/Auth/Process/AttributeRealm.php
+++ b/modules/core/lib/Auth/Process/AttributeRealm.php
@@ -52,5 +52,3 @@ class sspmod_core_Auth_Process_AttributeRealm extends SimpleSAML_Auth_Processing
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/core/lib/Auth/Process/GenerateGroups.php b/modules/core/lib/Auth/Process/GenerateGroups.php
index 86a2653232ee59417ebc45fef9eb4077ffdd2457..406e8c72a4d9e0dd7983da0b63a1de89d752a07b 100644
--- a/modules/core/lib/Auth/Process/GenerateGroups.php
+++ b/modules/core/lib/Auth/Process/GenerateGroups.php
@@ -140,5 +140,3 @@ class sspmod_core_Auth_Process_GenerateGroups extends SimpleSAML_Auth_Processing
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/core/lib/Auth/Process/TargetedID.php b/modules/core/lib/Auth/Process/TargetedID.php
index 069a3233ba52dc46db44cc1a804a498e34327662..aafdd23641fe0d5fb17aeb1b63e29160369f37a8 100644
--- a/modules/core/lib/Auth/Process/TargetedID.php
+++ b/modules/core/lib/Auth/Process/TargetedID.php
@@ -176,5 +176,3 @@ class sspmod_core_Auth_Process_TargetedID extends SimpleSAML_Auth_ProcessingFilt
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/core/lib/Auth/Process/WarnShortSSOInterval.php b/modules/core/lib/Auth/Process/WarnShortSSOInterval.php
index 731809bdabbad2484585ec0216ff87153f463264..1a731e3e641fb5c2f946ec1936687a7c75182d77 100644
--- a/modules/core/lib/Auth/Process/WarnShortSSOInterval.php
+++ b/modules/core/lib/Auth/Process/WarnShortSSOInterval.php
@@ -50,5 +50,3 @@ class sspmod_core_Auth_Process_WarnShortSSOInterval extends SimpleSAML_Auth_Proc
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/core/lib/Auth/Source/AdminPassword.php b/modules/core/lib/Auth/Source/AdminPassword.php
index e289759a026a99c7235c0827ae77d29701608153..adab5d60dbc39ef4e0850d0949d9f73272a9916e 100644
--- a/modules/core/lib/Auth/Source/AdminPassword.php
+++ b/modules/core/lib/Auth/Source/AdminPassword.php
@@ -62,6 +62,3 @@ class sspmod_core_Auth_Source_AdminPassword extends sspmod_core_Auth_UserPassBas
 	}
 
 }
-
-
-?>
\ No newline at end of file
diff --git a/modules/core/lib/Auth/UserPassBase.php b/modules/core/lib/Auth/UserPassBase.php
index 0d7318c4fdcd03ad13c935928c04fe11c525ae3d..de79c1f19449768a9da47c8c7759a14e0de4b84e 100644
--- a/modules/core/lib/Auth/UserPassBase.php
+++ b/modules/core/lib/Auth/UserPassBase.php
@@ -273,5 +273,3 @@ abstract class sspmod_core_Auth_UserPassBase extends SimpleSAML_Auth_Source {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/core/lib/Auth/UserPassOrgBase.php b/modules/core/lib/Auth/UserPassOrgBase.php
index 8ed4b7d852ce752a5961da7eba52d1b84f01f789..1ffdb53baa19eabca6c70d339d2a49035b44a152 100644
--- a/modules/core/lib/Auth/UserPassOrgBase.php
+++ b/modules/core/lib/Auth/UserPassOrgBase.php
@@ -286,5 +286,3 @@ abstract class sspmod_core_Auth_UserPassOrgBase extends SimpleSAML_Auth_Source {
 		return $source->getOrganizations();
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/modules/core/templates/authsource_list.tpl.php b/modules/core/templates/authsource_list.tpl.php
index 0f075e8a483d7f396f755416250a60122484328c..db0a7cede05e88b30b82fdfbae85b4f616adfe82 100644
--- a/modules/core/templates/authsource_list.tpl.php
+++ b/modules/core/templates/authsource_list.tpl.php
@@ -18,4 +18,3 @@ foreach ($this->data['sources'] as $id) {
 
 <?php
 $this->includeAtTemplateBase('includes/footer.php');
-?>
diff --git a/modules/core/templates/frontpage_auth.tpl.php b/modules/core/templates/frontpage_auth.tpl.php
index aa60379605dae560b067d7891bb91c9ea5b8b174..f0594948f1e2f19d7f067de38c526c2908108e0a 100644
--- a/modules/core/templates/frontpage_auth.tpl.php
+++ b/modules/core/templates/frontpage_auth.tpl.php
@@ -31,4 +31,4 @@ if ($this->data['isadmin']) {
 	
 
 		
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/core/templates/frontpage_config.tpl.php b/modules/core/templates/frontpage_config.tpl.php
index 9b32275eae4f31c962cac7dcddd1ffabe21dde30..bef8035214d65b38789b75dc845840cf33cf4d9c 100644
--- a/modules/core/templates/frontpage_config.tpl.php
+++ b/modules/core/templates/frontpage_config.tpl.php
@@ -94,4 +94,4 @@ if ($this->data['isadmin']) {
 	
 
 		
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/core/templates/frontpage_federation.tpl.php b/modules/core/templates/frontpage_federation.tpl.php
index e4f3827650b55ede091cd65673c0f74e8e9ec1a9..4891885676724fc3ae0c0f388669b47ed322ce75 100644
--- a/modules/core/templates/frontpage_federation.tpl.php
+++ b/modules/core/templates/frontpage_federation.tpl.php
@@ -163,4 +163,4 @@ if ($this->data['isadmin']) {
 	
 
 		
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/core/templates/frontpage_welcome.tpl.php b/modules/core/templates/frontpage_welcome.tpl.php
index 6a145c099de020701ba39b07e9c9c198f4bd368e..33d5ff25113874dd9ded7b920b7d94a7d5c8209d 100644
--- a/modules/core/templates/frontpage_welcome.tpl.php
+++ b/modules/core/templates/frontpage_welcome.tpl.php
@@ -33,4 +33,4 @@ if ($this->data['isadmin']) {
 
 
 		
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/core/templates/loginuserpass.php b/modules/core/templates/loginuserpass.php
index 98a778a4f26c0444174f7e420a3cced3adc5aa85..a0ccb0061d137f9428256434b780a907c865c1cc 100644
--- a/modules/core/templates/loginuserpass.php
+++ b/modules/core/templates/loginuserpass.php
@@ -149,4 +149,3 @@ echo('<h2 class="logintext">' . $this->t('{login:help_header}') . '</h2>');
 echo('<p class="logintext">' . $this->t('{login:help_text}') . '</p>');
 
 $this->includeAtTemplateBase('includes/footer.php');
-?>
diff --git a/modules/core/templates/logout-iframe.php b/modules/core/templates/logout-iframe.php
index 02291f72d34a68c241efbad7b15506aa335dade5..4730688955c02e49077a0c53de7fb952caa5ce26 100644
--- a/modules/core/templates/logout-iframe.php
+++ b/modules/core/templates/logout-iframe.php
@@ -213,4 +213,3 @@ if ($type === 'embed') {
 } else {
 	$this->includeAtTemplateBase('includes/footer.php');
 }
-?>
diff --git a/modules/core/templates/short_sso_interval.php b/modules/core/templates/short_sso_interval.php
index e9938519199437ee9b896e547dffd615fc1bf5e5..7310c40adbda355bfb4c2e886cf52381f4533c54 100644
--- a/modules/core/templates/short_sso_interval.php
+++ b/modules/core/templates/short_sso_interval.php
@@ -38,4 +38,3 @@ $this->includeAtTemplateBase('includes/header.php');
 
 <?php
 $this->includeAtTemplateBase('includes/footer.php');
-?>
diff --git a/modules/core/www/postredirect.php b/modules/core/www/postredirect.php
index df31a4ae913da29fbd1eca8556156b1c04c25293..9180bdfc48abfe73ec8fa5daad9fb6df986cbcde 100644
--- a/modules/core/www/postredirect.php
+++ b/modules/core/www/postredirect.php
@@ -50,5 +50,3 @@ $p->data['destination'] = $postData['url'];
 $p->data['post'] = $postData['post'];
 $p->show();
 exit(0);
-
-?>
\ No newline at end of file
diff --git a/modules/core/www/short_sso_interval.php b/modules/core/www/short_sso_interval.php
index 1949c7e76740adb29d8391674789a3a76ae7c5b7..6536631ab7a9c1ce1dc776e1925c2f032f0c72ff 100644
--- a/modules/core/www/short_sso_interval.php
+++ b/modules/core/www/short_sso_interval.php
@@ -32,6 +32,3 @@ $t->data['target'] = SimpleSAML_Module::getModuleURL('core/short_sso_interval.ph
 $t->data['params'] = array('StateId' => $id);
 $t->data['trackId'] = $session->getTrackID();
 $t->show();
-
-
-?>
\ No newline at end of file
diff --git a/modules/cron/config-templates/module_cron.php b/modules/cron/config-templates/module_cron.php
index 64daae484f435032f39a734ea07050d07bc938b3..32d5c28e7b6339f5b7b2f7f5c0647c5a64187d61 100644
--- a/modules/cron/config-templates/module_cron.php
+++ b/modules/cron/config-templates/module_cron.php
@@ -11,5 +11,3 @@ $config = array (
 	'sendemail' => TRUE,
 
 );
-
-?>
diff --git a/modules/cron/hooks/hook_cron.php b/modules/cron/hooks/hook_cron.php
index 27488d023fdf458973c3c3078cc8bc4529c35169..62f6a4cb9d11fcb4a49ebdfd2e51c3b3163d04aa 100644
--- a/modules/cron/hooks/hook_cron.php
+++ b/modules/cron/hooks/hook_cron.php
@@ -17,4 +17,3 @@ function cron_hook_cron(&$croninfo) {
 	}
 
 }
-?>
\ No newline at end of file
diff --git a/modules/cron/hooks/hook_frontpage.php b/modules/cron/hooks/hook_frontpage.php
index 76738b81869240d5d7d23bbf92758895010418c7..71a7374293309505f09706fa051363106e07de1a 100644
--- a/modules/cron/hooks/hook_frontpage.php
+++ b/modules/cron/hooks/hook_frontpage.php
@@ -14,4 +14,3 @@ function cron_hook_frontpage(&$links) {
 	);
 
 }
-?>
\ No newline at end of file
diff --git a/modules/cron/templates/croninfo-result.php b/modules/cron/templates/croninfo-result.php
index 89f9d5d297da8d384122a2624aabfb3eb0e92751..489cd5d51f383eb93401d88e2e8b9d9240bfa20f 100644
--- a/modules/cron/templates/croninfo-result.php
+++ b/modules/cron/templates/croninfo-result.php
@@ -17,4 +17,3 @@ $this->includeAtTemplateBase('includes/header.php');
 
 <?php
 $this->includeAtTemplateBase('includes/footer.php');
-?>
diff --git a/modules/cron/templates/croninfo-tpl.php b/modules/cron/templates/croninfo-tpl.php
index c10c7830223cafd96de632d619cfec58b25caa0c..49aa3131e0f90b77260b96f85eb9a73f9e74fc31 100644
--- a/modules/cron/templates/croninfo-tpl.php
+++ b/modules/cron/templates/croninfo-tpl.php
@@ -35,4 +35,3 @@ $run_text = $this->t('run_text');
 
 <?php
 $this->includeAtTemplateBase('includes/footer.php');
-?>
\ No newline at end of file
diff --git a/modules/cron/www/cron.php b/modules/cron/www/cron.php
index ac5390a8fa42df62baaa45da7fa38c490f5f3de1..3180ca5d523899fe21b03f5a2964e0b6b89b3f9f 100644
--- a/modules/cron/www/cron.php
+++ b/modules/cron/www/cron.php
@@ -58,5 +58,3 @@ if (isset($_REQUEST['output']) && $_REQUEST['output'] == "xhtml") {
 	$t->data['summary'] = $summary;
 	$t->show();
 }
-
-?>
\ No newline at end of file
diff --git a/modules/cron/www/croninfo.php b/modules/cron/www/croninfo.php
index a0ecd68d92584aca9bceed974e86030d56b34055..6be04ebf6a38ce94f3560b45bb5ede7be89f4448 100644
--- a/modules/cron/www/croninfo.php
+++ b/modules/cron/www/croninfo.php
@@ -39,6 +39,3 @@ foreach ($tags AS $tag) {
 $t = new SimpleSAML_XHTML_Template($config, 'cron:croninfo-tpl.php', 'cron:cron');
 $t->data['urls'] = $urls;
 $t->show();
-
-
-?>
\ No newline at end of file
diff --git a/modules/discopower/config-templates/module_discopower.php b/modules/discopower/config-templates/module_discopower.php
index b2e780c0b176fc14e70c889c44a5def89707590c..4a17e1f7b633645ebdcb68a7fac32215a1e37ce4 100644
--- a/modules/discopower/config-templates/module_discopower.php
+++ b/modules/discopower/config-templates/module_discopower.php
@@ -44,5 +44,3 @@ $config = array (
 	'cdc.lifetime' => NULL,
 
 );
-
-?>
diff --git a/modules/discopower/templates/disco-tpl.php b/modules/discopower/templates/disco-tpl.php
index 916cb16dd42117cda7a4caa25c8eaa7300ffbeeb..f3c981412cfb12181e52302e29291529de15d1bf 100644
--- a/modules/discopower/templates/disco-tpl.php
+++ b/modules/discopower/templates/disco-tpl.php
@@ -210,4 +210,4 @@ foreach( $this->data['idplist'] AS $tab => $slist) {
 </div>
 
 		
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/discopower/www/disco.php b/modules/discopower/www/disco.php
index 2b21d45513f1bcb4790a73e5ffbe2dfe12eb2216..5e8b82d1ec594ae74db3c4bfb9e900fd22940ea2 100644
--- a/modules/discopower/www/disco.php
+++ b/modules/discopower/www/disco.php
@@ -13,5 +13,3 @@ try {
 	/* An error here should be caused by metadata. */
 	throw new SimpleSAML_Error_Error('METADATA', $exception);
 }
-
-?>
\ No newline at end of file
diff --git a/modules/exampleauth/lib/Auth/Process/RedirectTest.php b/modules/exampleauth/lib/Auth/Process/RedirectTest.php
index 1ed8103948fb8bd5b5c8f5f1850577e28fabaac2..79e5293e02673fdae333e5713db6b13774e1fd9e 100644
--- a/modules/exampleauth/lib/Auth/Process/RedirectTest.php
+++ b/modules/exampleauth/lib/Auth/Process/RedirectTest.php
@@ -26,5 +26,3 @@ class sspmod_exampleauth_Auth_Process_RedirectTest extends SimpleSAML_Auth_Proce
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/exampleauth/lib/Auth/Source/Static.php b/modules/exampleauth/lib/Auth/Source/Static.php
index 8328fabd3a08c656d3d154d47ccd079948928ad5..68ddf576991192e8e160dfb0e1c8be58048a8343 100644
--- a/modules/exampleauth/lib/Auth/Source/Static.php
+++ b/modules/exampleauth/lib/Auth/Source/Static.php
@@ -55,5 +55,3 @@ class sspmod_exampleauth_Auth_Source_Static extends SimpleSAML_Auth_Source {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/exampleauth/lib/Auth/Source/UserPass.php b/modules/exampleauth/lib/Auth/Source/UserPass.php
index c1af28533236f26848f4d2d7da1bc7e546e4d6b4..f34bc33c74b60140decd7f7c8a0bafa73c3f1ca6 100644
--- a/modules/exampleauth/lib/Auth/Source/UserPass.php
+++ b/modules/exampleauth/lib/Auth/Source/UserPass.php
@@ -88,5 +88,3 @@ class sspmod_exampleauth_Auth_Source_UserPass extends sspmod_core_Auth_UserPassB
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/exampleauth/www/redirecttest.php b/modules/exampleauth/www/redirecttest.php
index d8d8d26f7895bc3ff1810bfda723b65501cfd8b7..03ed359e3d5495fd6cffc95b378ca663fe3d29a2 100644
--- a/modules/exampleauth/www/redirecttest.php
+++ b/modules/exampleauth/www/redirecttest.php
@@ -24,5 +24,3 @@ $state = SimpleSAML_Auth_State::loadState($id, 'exampleauth:redirectfilter-test'
 $state['Attributes']['RedirectTest2'] = array('OK');
 
 SimpleSAML_Auth_ProcessingChain::resumeProcessing($state);
-
-?>
\ No newline at end of file
diff --git a/modules/expirycheck/lib/Auth/Process/ExpiryDate.php b/modules/expirycheck/lib/Auth/Process/ExpiryDate.php
index 30df1bac6a242d0f7e6d2a0b497eca2c8207a04f..45a371903bf446ea254a978be75d32c095a2c151 100644
--- a/modules/expirycheck/lib/Auth/Process/ExpiryDate.php
+++ b/modules/expirycheck/lib/Auth/Process/ExpiryDate.php
@@ -155,6 +155,3 @@ class sspmod_expirycheck_Auth_Process_ExpiryDate extends SimpleSAML_Auth_Process
 
 
 }
-
-
-?>
diff --git a/modules/expirycheck/templates/about2expire.php b/modules/expirycheck/templates/about2expire.php
index 2fe6f864796ce96d293b1a8ff19510b09b7178af..6b7752dab185680224ec41416adc22bea297ce81 100644
--- a/modules/expirycheck/templates/about2expire.php
+++ b/modules/expirycheck/templates/about2expire.php
@@ -89,4 +89,3 @@ $this->includeAtTemplateBase('includes/header.php');
 <?php
 
 $this->includeAtTemplateBase('includes/footer.php');
-?>
diff --git a/modules/expirycheck/templates/expired.php b/modules/expirycheck/templates/expired.php
index 817589f5dab0e015bc454d0322f55dbd71b5a92b..2095d809926fd1347c80ccb340fc9eb8a0bd72e3 100644
--- a/modules/expirycheck/templates/expired.php
+++ b/modules/expirycheck/templates/expired.php
@@ -9,4 +9,3 @@ $this->includeAtTemplateBase('includes/header.php');
 		<p><?php echo $this->t('{expirycheck:expwarning:contact_home}');?></p>
 <?php
 $this->includeAtTemplateBase('includes/footer.php');
-?>
diff --git a/modules/expirycheck/www/about2expire.php b/modules/expirycheck/www/about2expire.php
index f42406056f9bb97e9d547187b4b777f6903583d8..551a18c56ac58d6e27bd2c567ea584dde5fbb4e0 100644
--- a/modules/expirycheck/www/about2expire.php
+++ b/modules/expirycheck/www/about2expire.php
@@ -37,6 +37,3 @@ $t->data['daysleft'] = $state['daysleft'];
 $t->data['expireOnDate'] = $state['expireOnDate'];
 $t->data['netId'] = $state['netId'];
 $t->show();
-
-
-?>
diff --git a/modules/expirycheck/www/expired.php b/modules/expirycheck/www/expired.php
index 68523d86897288297eb3b94c6ea77f8455b8495e..69fb16dc8df585d1491a8b5612082919ec666769 100644
--- a/modules/expirycheck/www/expired.php
+++ b/modules/expirycheck/www/expired.php
@@ -28,6 +28,3 @@ $t = new SimpleSAML_XHTML_Template($globalConfig, 'expirycheck:expired.php');
 $t->data['expireOnDate'] = $state['expireOnDate'];
 $t->data['netId'] = $state['netId'];
 $t->show();
-
-
-?>
diff --git a/modules/ldap/lib/Auth/Source/LDAP.php b/modules/ldap/lib/Auth/Source/LDAP.php
index 4d81e638d3fb47fadb9f3b840548a28e24131f30..4ac9aece338906aaae830cc495acd53f37a36b5a 100644
--- a/modules/ldap/lib/Auth/Source/LDAP.php
+++ b/modules/ldap/lib/Auth/Source/LDAP.php
@@ -52,6 +52,3 @@ class sspmod_ldap_Auth_Source_LDAP extends sspmod_core_Auth_UserPassBase {
 	}
 
 }
-
-
-?>
\ No newline at end of file
diff --git a/modules/ldap/lib/Auth/Source/LDAPMulti.php b/modules/ldap/lib/Auth/Source/LDAPMulti.php
index 0533324a650e0c5419dba6fc064b9e68956177fe..a879cc5398d794894dc4ae679a4ec375e42c2841 100644
--- a/modules/ldap/lib/Auth/Source/LDAPMulti.php
+++ b/modules/ldap/lib/Auth/Source/LDAPMulti.php
@@ -119,6 +119,3 @@ class sspmod_ldap_Auth_Source_LDAPMulti extends sspmod_core_Auth_UserPassOrgBase
 	}
 
 }
-
-
-?>
\ No newline at end of file
diff --git a/modules/logpeek/config-templates/module_logpeek.php b/modules/logpeek/config-templates/module_logpeek.php
index bc8cf0ad5141db4fec72800ea241ec7cba84f592..40d4693a46aa40f861af4cdf646bead3a51768a9 100644
--- a/modules/logpeek/config-templates/module_logpeek.php
+++ b/modules/logpeek/config-templates/module_logpeek.php
@@ -9,5 +9,3 @@ $config = array (
 	// Read block size. 8192 is max, limited by fread.
 	'blocksz'	=> 8192,
 );
-
-?>
diff --git a/modules/logpeek/hooks/hook_frontpage.php b/modules/logpeek/hooks/hook_frontpage.php
index c92e43bee7315ef2eb3e9eb67e3799cb279974a0..6b850d3ff34cc263c85749b480372e70705a082a 100644
--- a/modules/logpeek/hooks/hook_frontpage.php
+++ b/modules/logpeek/hooks/hook_frontpage.php
@@ -14,4 +14,3 @@ function logpeek_hook_frontpage(&$links) {
 	);
 
 }
-?>
\ No newline at end of file
diff --git a/modules/logpeek/lib/File/reverseRead.php b/modules/logpeek/lib/File/reverseRead.php
index 99ceac57a69ffa118615233683373f96783ccff4..26a1ac1cec43e1700ae267b6d6d41b771b2ca38e 100644
--- a/modules/logpeek/lib/File/reverseRead.php
+++ b/modules/logpeek/lib/File/reverseRead.php
@@ -221,4 +221,3 @@ class sspmod_logpeek_File_reverseRead{
 	}
 	
 }
-?>
\ No newline at end of file
diff --git a/modules/logpeek/lib/Syslog/parseLine.php b/modules/logpeek/lib/Syslog/parseLine.php
index be354b3f21ee745d334d24815da07febd8f5f875..e2d56f9221c012fabb6a27ca18e95873afcd6d76 100644
--- a/modules/logpeek/lib/Syslog/parseLine.php
+++ b/modules/logpeek/lib/Syslog/parseLine.php
@@ -22,4 +22,3 @@ class sspmod_logpeek_Syslog_parseLine{
 		return strtotime($time);
 	}
 }
-?>
\ No newline at end of file
diff --git a/modules/logpeek/templates/logpeek.php b/modules/logpeek/templates/logpeek.php
index 848ce87cb78ab6fd346a74d8499644da31e5b78b..2b25e282db3580a94ac6ed0f25a99b86a417c70f 100644
--- a/modules/logpeek/templates/logpeek.php
+++ b/modules/logpeek/templates/logpeek.php
@@ -24,4 +24,4 @@ if (!empty($this->data['results'])) {
 }
 ?>
 </pre>
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/logpeek/www/index.php b/modules/logpeek/www/index.php
index 3ae3e70996a84073b4f84a2119fa8267792ed425..9c763571ebb1c3ad07fa40475cb248fe7d39a66f 100644
--- a/modules/logpeek/www/index.php
+++ b/modules/logpeek/www/index.php
@@ -51,4 +51,3 @@ $t->data['endtime'] = date(DATE_RFC822, $lastTimeEpoch);
 $t->data['filesize'] = $fileSize;
 
 $t->show();
-?>
\ No newline at end of file
diff --git a/modules/memcacheMonitor/hooks/hook_frontpage.php b/modules/memcacheMonitor/hooks/hook_frontpage.php
index 048cc6d9187641a0503d8c541f260ff997bc4d1f..64c084344edf375e7e6f66eaed56039a6021e23a 100644
--- a/modules/memcacheMonitor/hooks/hook_frontpage.php
+++ b/modules/memcacheMonitor/hooks/hook_frontpage.php
@@ -14,6 +14,3 @@ function memcacheMonitor_hook_frontpage(&$links) {
 	);
 	
 }
-
-
-?>
diff --git a/modules/memcacheMonitor/hooks/hook_sanitycheck.php b/modules/memcacheMonitor/hooks/hook_sanitycheck.php
index 88df0464656909eddd3ba2b0673dd4acba923df5..b5b28d250966c07059998e507b65ecff0f85b276 100644
--- a/modules/memcacheMonitor/hooks/hook_sanitycheck.php
+++ b/modules/memcacheMonitor/hooks/hook_sanitycheck.php
@@ -33,6 +33,3 @@ function memcacheMonitor_hook_sanitycheck(&$hookinfo) {
 		$hookinfo['info'][] = '[memcacheMonitor] All servers responding.';
 	}
 }
-
-
-?>
\ No newline at end of file
diff --git a/modules/memcacheMonitor/templates/memcachestat.tpl.php b/modules/memcacheMonitor/templates/memcachestat.tpl.php
index 1bd523bb54e47e68bfd9416f191d11ab933b5635..a3e2d108179d493ebf9cce7d58c2a44432cc9c9c 100644
--- a/modules/memcacheMonitor/templates/memcachestat.tpl.php
+++ b/modules/memcacheMonitor/templates/memcachestat.tpl.php
@@ -99,4 +99,3 @@ if (array_key_exists('bytes', $this->data['statsraw']) && array_key_exists('limi
 
 <?php
 $this->includeAtTemplateBase('includes/footer.php');
-?>
\ No newline at end of file
diff --git a/modules/metaedit/hooks/hook_frontpage.php b/modules/metaedit/hooks/hook_frontpage.php
index 9c9a6646fe43adfa66d98cd14ed16ceb6d807cc3..f62fcf8845329c7ef359f946ec120f91074e842a 100644
--- a/modules/metaedit/hooks/hook_frontpage.php
+++ b/modules/metaedit/hooks/hook_frontpage.php
@@ -15,4 +15,3 @@ function metaedit_hook_frontpage(&$links) {
 	);
 
 }
-?>
\ No newline at end of file
diff --git a/modules/metarefresh/hooks/hook_cron.php b/modules/metarefresh/hooks/hook_cron.php
index ce9be0c9d2372d5704bbb61ec3a239eb2306bdd6..f1a0512c7840d35e154a53b2fb271d38f2556bb8 100644
--- a/modules/metarefresh/hooks/hook_cron.php
+++ b/modules/metarefresh/hooks/hook_cron.php
@@ -95,4 +95,3 @@ function metarefresh_hook_cron(&$croninfo) {
 		$croninfo['summary'][] = 'Error during metarefresh: ' . $e->getMessage();
 	}
 }
-?>
\ No newline at end of file
diff --git a/modules/metarefresh/hooks/hook_frontpage.php b/modules/metarefresh/hooks/hook_frontpage.php
index 311cbc8d3ee4eaabc26ab155fe4ecfac9861c7f8..9114ea808fbcf27ecc874f047fa56cff4a0b7546 100644
--- a/modules/metarefresh/hooks/hook_frontpage.php
+++ b/modules/metarefresh/hooks/hook_frontpage.php
@@ -14,4 +14,3 @@ function metarefresh_hook_frontpage(&$links) {
 	);
 
 }
-?>
\ No newline at end of file
diff --git a/modules/metarefresh/lib/MetaLoader.php b/modules/metarefresh/lib/MetaLoader.php
index f34b58f0c2c9238032a004462cc4c6defbc93309..86e68b02fcea054094bd0d1e3d453377d043e1e2 100644
--- a/modules/metarefresh/lib/MetaLoader.php
+++ b/modules/metarefresh/lib/MetaLoader.php
@@ -444,5 +444,3 @@ class sspmod_metarefresh_MetaLoader {
 	}
 
 }
-
-?>
diff --git a/modules/metarefresh/templates/fetch.tpl.php b/modules/metarefresh/templates/fetch.tpl.php
index 6a1066cbcbd1274075ae0de2158a80bbaba47ff6..512f6f429f3cc6b937ee5e38a062ca66d61d98da 100644
--- a/modules/metarefresh/templates/fetch.tpl.php
+++ b/modules/metarefresh/templates/fetch.tpl.php
@@ -20,4 +20,3 @@ if (!empty($this->data['logentries'])) {
 
 
 $this->includeAtTemplateBase('includes/footer.php');
-?>
\ No newline at end of file
diff --git a/modules/modinfo/hooks/hook_frontpage.php b/modules/modinfo/hooks/hook_frontpage.php
index 8e66d32a0b16675bb92eafa247607efb9199ee80..12aaa6d1a57904fa5c9cfe4f8951cbdd75b4c441 100644
--- a/modules/modinfo/hooks/hook_frontpage.php
+++ b/modules/modinfo/hooks/hook_frontpage.php
@@ -14,4 +14,3 @@ function modinfo_hook_frontpage(&$links) {
 		);
 
 }
-?>
\ No newline at end of file
diff --git a/modules/modinfo/hooks/hook_moduleinfo.php b/modules/modinfo/hooks/hook_moduleinfo.php
index 3518f70121101fc6fc62bd0edcb4c99086cc452a..2436715ea4333e71ff550e3b2fca19d9b4827f94 100644
--- a/modules/modinfo/hooks/hook_moduleinfo.php
+++ b/modules/modinfo/hooks/hook_moduleinfo.php
@@ -18,4 +18,3 @@ function modinfo_hook_moduleinfo(&$moduleinfo) {
 	);
 
 }
-?>
\ No newline at end of file
diff --git a/modules/modinfo/templates/modlist.php b/modules/modinfo/templates/modlist.php
index 26c7a3f5a34ba66a7e2f170bb10ed1ebe2d502df..f3c157cccd60dbc791b4b1563f61071a234dd5ea 100644
--- a/modules/modinfo/templates/modlist.php
+++ b/modules/modinfo/templates/modlist.php
@@ -61,4 +61,4 @@ foreach($this->data['modules'] as $id => $info) {
 }
 ?>
 </table>
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/modinfo/www/index.php b/modules/modinfo/www/index.php
index d8b4547fcef0ea2e203aa21b8dd09e31bdd8cc4c..9e431d88976c889f42dfab0d653f564fb42bb35d 100644
--- a/modules/modinfo/www/index.php
+++ b/modules/modinfo/www/index.php
@@ -27,5 +27,3 @@ $config = SimpleSAML_Configuration::getInstance();
 $t = new SimpleSAML_XHTML_Template($config, 'modinfo:modlist.php');
 $t->data['modules'] = $modinfo;
 $t->show();
-
-?>
\ No newline at end of file
diff --git a/modules/multiauth/lib/Auth/Source/MultiAuth.php b/modules/multiauth/lib/Auth/Source/MultiAuth.php
index d4dd83cd35bd126b3f77f79f0c83d929e6a187d3..de7fcd4b006f5201a810715c0f4c41dc3c550e39 100644
--- a/modules/multiauth/lib/Auth/Source/MultiAuth.php
+++ b/modules/multiauth/lib/Auth/Source/MultiAuth.php
@@ -226,5 +226,3 @@ class sspmod_multiauth_Auth_Source_MultiAuth extends SimpleSAML_Auth_Source {
 		}
 	}
 }
-
-?>
diff --git a/modules/multiauth/templates/selectsource.php b/modules/multiauth/templates/selectsource.php
index 1f16f31a77541f529c6bc4196a34be135e132f72..f5eaba07e742a959fa8ddcba53196eb45185a7cf 100644
--- a/modules/multiauth/templates/selectsource.php
+++ b/modules/multiauth/templates/selectsource.php
@@ -28,4 +28,4 @@ foreach($this->data['sources'] as $source) {
 ?>
 </ul>
 </form>
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/multiauth/www/selectsource.php b/modules/multiauth/www/selectsource.php
index b085baaa49da07972b52668576fda2d32948cb36..ecd76211545e3637c2855801de94441571281ea1 100644
--- a/modules/multiauth/www/selectsource.php
+++ b/modules/multiauth/www/selectsource.php
@@ -65,5 +65,3 @@ if ($as !== NULL) {
 }
 $t->show();
 exit();
-
-?>
\ No newline at end of file
diff --git a/modules/negotiate/templates/disable.php b/modules/negotiate/templates/disable.php
index 8022d8acffe15252d89206e97ccefba330a3f3ba..28acd0933edf3be3760b765f1db4185ae78ff5a2 100644
--- a/modules/negotiate/templates/disable.php
+++ b/modules/negotiate/templates/disable.php
@@ -17,4 +17,4 @@ $url = SimpleSAML_Module::getModuleURL('negotiate/enable.php');
 
 <?php echo $this->t('{negotiate:negotiate:info_post}'); ?>
 
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/negotiate/templates/enable.php b/modules/negotiate/templates/enable.php
index e4bd77c3353afbdfd9d95e230a4c58dc11ba4fbd..ff07e65f6ed6de2b2447279a1d0b0806f312dced 100644
--- a/modules/negotiate/templates/enable.php
+++ b/modules/negotiate/templates/enable.php
@@ -18,4 +18,4 @@ $url = SimpleSAML_Module::getModuleURL('negotiate/disable.php');
 
 <?php echo $this->t('{negotiate:negotiate:info_post}'); ?>
 
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/oauth/hooks/hook_cron.php b/modules/oauth/hooks/hook_cron.php
index 60483082be77cf52a626ed425eb72995ae76d741..9b27aafef140ff29e009abe423f0293b63201558 100644
--- a/modules/oauth/hooks/hook_cron.php
+++ b/modules/oauth/hooks/hook_cron.php
@@ -27,4 +27,3 @@ function oauth_hook_cron(&$croninfo) {
 		$croninfo['summary'][] = $message;
 	}
 }
-?>
\ No newline at end of file
diff --git a/modules/oauth/hooks/hook_frontpage.php b/modules/oauth/hooks/hook_frontpage.php
index a9733b1afe85e6cf5bf9280ca6e0543288033bbd..5112bc2e91f5df48433d9da7fdda5152e925b5ec 100644
--- a/modules/oauth/hooks/hook_frontpage.php
+++ b/modules/oauth/hooks/hook_frontpage.php
@@ -15,4 +15,3 @@ function oauth_hook_frontpage(&$links) {
 	);
 
 }
-?>
\ No newline at end of file
diff --git a/modules/oauth/lib/OAuthSignatureMethodRSASHA1.php b/modules/oauth/lib/OAuthSignatureMethodRSASHA1.php
index 8c2e0449ebf05f11f79221bf15874e7a41f27280..a29d68ef146950b3be6ea059710382be67c0a5af 100644
--- a/modules/oauth/lib/OAuthSignatureMethodRSASHA1.php
+++ b/modules/oauth/lib/OAuthSignatureMethodRSASHA1.php
@@ -29,4 +29,3 @@ class sspmod_oauth_OAuthSignatureMethodRSASHA1 extends OAuthSignatureMethod_RSA_
 		return $oConsumer->secret;
 	}
 }
-?>
\ No newline at end of file
diff --git a/modules/oauth/libextinc/OAuth.php b/modules/oauth/libextinc/OAuth.php
index f02fccd6c1823ca4fca40840496aaac8b59704f1..a4c438f8aca3149e262debb2a0b6921dd5d88b26 100644
--- a/modules/oauth/libextinc/OAuth.php
+++ b/modules/oauth/libextinc/OAuth.php
@@ -891,5 +891,3 @@ class OAuthUtil {
     return implode('&', $pairs);
   }
 }
-
-?>
diff --git a/modules/oauth/templates/authorized.php b/modules/oauth/templates/authorized.php
index 264751a0de349ff98afc01c46d153730e3c2b556..7ce806d56637d23b0944f571af24ba20e51815de 100644
--- a/modules/oauth/templates/authorized.php
+++ b/modules/oauth/templates/authorized.php
@@ -17,4 +17,3 @@ $this->includeAtTemplateBase('includes/header.php');
 
 <?php
 $this->includeAtTemplateBase('includes/footer.php');
-?>
\ No newline at end of file
diff --git a/modules/oauth/templates/consent.php b/modules/oauth/templates/consent.php
index c82af245d8713c727df1d064ba8b9e8b1635e794..efb883df6caa0f6e6200bd994403014d49005d0c 100644
--- a/modules/oauth/templates/consent.php
+++ b/modules/oauth/templates/consent.php
@@ -16,4 +16,3 @@ $this->includeAtTemplateBase('includes/header.php');
 
 <?php
 $this->includeAtTemplateBase('includes/footer.php');
-?>
\ No newline at end of file
diff --git a/modules/papi/lib/Auth/Source/PAPI.php b/modules/papi/lib/Auth/Source/PAPI.php
index 10ffd0eeff4c39f132765c51e685dd6829642c2e..37ea144b6d53a19e2f2059002ac895bdf5a8880f 100644
--- a/modules/papi/lib/Auth/Source/PAPI.php
+++ b/modules/papi/lib/Auth/Source/PAPI.php
@@ -183,5 +183,3 @@ class sspmod_papi_Auth_Source_PAPI extends SimpleSAML_Auth_Source {
 	}
 
 }
-
-?>
diff --git a/modules/portal/config-templates/module_portal.php b/modules/portal/config-templates/module_portal.php
index b7b8173155f15431ddfbd4619d66450e4d122c55..bff5d9ac66ccfd02cff2adf2f3cae0fbfb5db3e5 100644
--- a/modules/portal/config-templates/module_portal.php
+++ b/modules/portal/config-templates/module_portal.php
@@ -11,5 +11,3 @@ $config = array (
 	),
 	
 );
-
-?>
diff --git a/modules/preprodwarning/lib/Auth/Process/Warning.php b/modules/preprodwarning/lib/Auth/Process/Warning.php
index 0f25527ae42bd56efdddaf7994212eb05dcf5edb..1c734091e2440c5802c94751c8b71644b985a3d7 100644
--- a/modules/preprodwarning/lib/Auth/Process/Warning.php
+++ b/modules/preprodwarning/lib/Auth/Process/Warning.php
@@ -34,5 +34,3 @@ class sspmod_preprodwarning_Auth_Process_Warning extends SimpleSAML_Auth_Process
 
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/preprodwarning/templates/warning.php b/modules/preprodwarning/templates/warning.php
index da4ccf52d79ae6741bdda2645a44f026b119ca6c..ea01ceaf2728cc8d4e3033d2064b4e1c72772665 100644
--- a/modules/preprodwarning/templates/warning.php
+++ b/modules/preprodwarning/templates/warning.php
@@ -42,4 +42,3 @@ $this->includeAtTemplateBase('includes/header.php');
 <?php
 
 $this->includeAtTemplateBase('includes/footer.php');
-?>
diff --git a/modules/preprodwarning/www/showwarning.php b/modules/preprodwarning/www/showwarning.php
index 79466e8bd9040b0e775f1f3c9aca9bd564ecb1b9..43a07cff0d4b6afca49d545c3d4be6f3e8ebf379 100644
--- a/modules/preprodwarning/www/showwarning.php
+++ b/modules/preprodwarning/www/showwarning.php
@@ -38,6 +38,3 @@ $t = new SimpleSAML_XHTML_Template($globalConfig, 'preprodwarning:warning.php');
 $t->data['yesTarget'] = SimpleSAML_Module::getModuleURL('preprodwarning/showwarning.php');
 $t->data['yesData'] = array('StateId' => $id);
 $t->show();
-
-
-?>
\ No newline at end of file
diff --git a/modules/saml/lib/Error.php b/modules/saml/lib/Error.php
index 19d05933e69956a8332a0f50f7aa555f33c053e1..a920e124ca831cb805d700d48d08d264b211b984 100644
--- a/modules/saml/lib/Error.php
+++ b/modules/saml/lib/Error.php
@@ -191,5 +191,3 @@ class sspmod_saml_Error extends SimpleSAML_Error_Exception {
 		return $status;
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/modules/saml/www/idp/certs.php b/modules/saml/www/idp/certs.php
index a26da33792b24b13ef2586882e8ad898cfc7fadd..328cda4d2786c06a3fb3a9e68760a5e00f614fd6 100644
--- a/modules/saml/www/idp/certs.php
+++ b/modules/saml/www/idp/certs.php
@@ -33,5 +33,3 @@ header('Content-Disposition: attachment; filename='.substr($_SERVER['PATH_INFO']
 header('Content-Type: application/x-x509-ca-cert');
 echo $certInfo['PEM'];
 exit(0);
-
-?>
diff --git a/modules/saml/www/sp/metadata.php b/modules/saml/www/sp/metadata.php
index 80033a782d6c8fd50d023390fb9fd349f2da7a62..647192a9ad194776fe78ce7bdf5b3b5bfeae0fea 100644
--- a/modules/saml/www/sp/metadata.php
+++ b/modules/saml/www/sp/metadata.php
@@ -229,4 +229,3 @@ if (array_key_exists('output', $_REQUEST) && $_REQUEST['output'] == 'xhtml') {
 	header('Content-Type: application/samlmetadata+xml');
 	echo($xml);
 }
-?>
diff --git a/modules/saml/www/sp/saml1-acs.php b/modules/saml/www/sp/saml1-acs.php
index fcfd5a0736a891f32505dde97ebdf4988d76ec97..de98e34915031a54a1821e1b9911ae2ac5a9a42c 100644
--- a/modules/saml/www/sp/saml1-acs.php
+++ b/modules/saml/www/sp/saml1-acs.php
@@ -91,5 +91,3 @@ $state['LogoutState'] = $logoutState;
 
 $source->handleResponse($state, $responseIssuer, $attributes);
 assert('FALSE');
-
-?>
diff --git a/modules/saml2debug/hooks/hook_frontpage.php b/modules/saml2debug/hooks/hook_frontpage.php
index a59ae67e722685e024ac32d223f1810468f8fc89..dfc913ff75cc13194c2ee7fccd6aa9a08ae81635 100644
--- a/modules/saml2debug/hooks/hook_frontpage.php
+++ b/modules/saml2debug/hooks/hook_frontpage.php
@@ -14,6 +14,3 @@ function saml2debug_hook_frontpage(&$links) {
 	);
 	
 }
-
-
-?>
diff --git a/modules/saml2debug/templates/debug.tpl.php b/modules/saml2debug/templates/debug.tpl.php
index 47849ab3520ce4ffde3a48c1201ea0260641b376..05ce4aa8c14f2e44fc832a5ea1f563606ae4bf21 100644
--- a/modules/saml2debug/templates/debug.tpl.php
+++ b/modules/saml2debug/templates/debug.tpl.php
@@ -65,4 +65,4 @@ $this->includeAtTemplateBase('includes/header.php');
 
 
 
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/modules/saml2debug/www/debug.php b/modules/saml2debug/www/debug.php
index 391b1b8057d5f203983dac567df35365bef87328..644e600cf814a04057ba249e8d898cf1fd0bad58 100644
--- a/modules/saml2debug/www/debug.php
+++ b/modules/saml2debug/www/debug.php
@@ -64,5 +64,3 @@ $t->data['encoded'] = $encoded;
 $t->data['decoded'] = $decoded;
 $t->data['activeTab'] = $activeTab;
 $t->show();
-
-?>
\ No newline at end of file
diff --git a/modules/sanitycheck/config-templates/config-sanitycheck.php b/modules/sanitycheck/config-templates/config-sanitycheck.php
index ad607479f4b854b53bfa22c4c11e5e8743bfa6b4..78635c5dace2fb1fdeb682534e24cc7b5791dcd3 100644
--- a/modules/sanitycheck/config-templates/config-sanitycheck.php
+++ b/modules/sanitycheck/config-templates/config-sanitycheck.php
@@ -14,5 +14,3 @@ $config = array (
 	'cron_tag' => 'hourly',
 
 );
-
-?>
\ No newline at end of file
diff --git a/modules/sanitycheck/hooks/hook_cron.php b/modules/sanitycheck/hooks/hook_cron.php
index 049447e3a582668d20b9bc26e7d4da7227ba68c2..7b779a1fe92ef4494924aa1c2325845f9af2f19e 100644
--- a/modules/sanitycheck/hooks/hook_cron.php
+++ b/modules/sanitycheck/hooks/hook_cron.php
@@ -40,4 +40,3 @@ function sanitycheck_hook_cron(&$croninfo) {
 	}
 
 }
-?>
\ No newline at end of file
diff --git a/modules/sanitycheck/hooks/hook_frontpage.php b/modules/sanitycheck/hooks/hook_frontpage.php
index 57b3cfce005750ccc927caf44e58144759be600d..f76e482c572418f2a7639249b2730fbfaf61c499 100644
--- a/modules/sanitycheck/hooks/hook_frontpage.php
+++ b/modules/sanitycheck/hooks/hook_frontpage.php
@@ -15,4 +15,3 @@ function sanitycheck_hook_frontpage(&$links) {
 	);
 
 }
-?>
\ No newline at end of file
diff --git a/modules/sanitycheck/hooks/hook_moduleinfo.php b/modules/sanitycheck/hooks/hook_moduleinfo.php
index ff9642df56a95be0f4b374d57c54d88a7842dd80..c18672711b4affdc27d4683e1904f487c2f0a763 100644
--- a/modules/sanitycheck/hooks/hook_moduleinfo.php
+++ b/modules/sanitycheck/hooks/hook_moduleinfo.php
@@ -17,4 +17,3 @@ function sanitycheck_hook_moduleinfo(&$moduleinfo) {
 	);
 
 }
-?>
\ No newline at end of file
diff --git a/modules/sanitycheck/hooks/hook_sanitycheck.php b/modules/sanitycheck/hooks/hook_sanitycheck.php
index dbba1bec78c0476daa4cc246e18f2ff6045459b1..c15f1c68f503034811d8d8205464a0f633e20cc9 100644
--- a/modules/sanitycheck/hooks/hook_sanitycheck.php
+++ b/modules/sanitycheck/hooks/hook_sanitycheck.php
@@ -12,4 +12,3 @@ function sanitycheck_hook_sanitycheck(&$hookinfo) {
 	$hookinfo['info'][] = '[sanitycheck] At least the sanity check itself is working :)';	
 	
 }
-?>
diff --git a/modules/smartattributes/lib/Auth/Process/SmartName.php b/modules/smartattributes/lib/Auth/Process/SmartName.php
index 3c97bf1c56e08e83aeae7fa02cb330e74767be5d..035d28a1eb3dcfdfd56dd29bcd5d1c5784e2aa1c 100644
--- a/modules/smartattributes/lib/Auth/Process/SmartName.php
+++ b/modules/smartattributes/lib/Auth/Process/SmartName.php
@@ -74,5 +74,3 @@ class sspmod_smartattribute_Auth_Process_SmartName extends SimpleSAML_Auth_Proce
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/smartnameattribute/lib/Auth/Process/SmartName.php b/modules/smartnameattribute/lib/Auth/Process/SmartName.php
index 48c177e975a785f9a235245bf09f89a16e986503..498715c39bcff12fe7ad334cea44a406a01e57fc 100644
--- a/modules/smartnameattribute/lib/Auth/Process/SmartName.php
+++ b/modules/smartnameattribute/lib/Auth/Process/SmartName.php
@@ -76,5 +76,3 @@ class sspmod_smartnameattribute_Auth_Process_SmartName extends SimpleSAML_Auth_P
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/sqlauth/lib/Auth/Source/SQL.php b/modules/sqlauth/lib/Auth/Source/SQL.php
index cac7e48215b97b6d6914b8e21b05a359dd2ce81e..3279fbe0efa3d37dd1b5e11540de0dc6c5c1a678 100644
--- a/modules/sqlauth/lib/Auth/Source/SQL.php
+++ b/modules/sqlauth/lib/Auth/Source/SQL.php
@@ -191,5 +191,3 @@ class sspmod_sqlauth_Auth_Source_SQL extends sspmod_core_Auth_UserPassBase {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/statistics/hooks/hook_cron.php b/modules/statistics/hooks/hook_cron.php
index c97141febfdc899be29e065750f3dc86168aec75..1e608d3df985843af8497710ebd08c694d390149 100644
--- a/modules/statistics/hooks/hook_cron.php
+++ b/modules/statistics/hooks/hook_cron.php
@@ -33,4 +33,3 @@ function statistics_hook_cron(&$croninfo) {
 		$croninfo['summary'][] = $message;
 	}
 }
-?>
\ No newline at end of file
diff --git a/modules/statistics/hooks/hook_frontpage.php b/modules/statistics/hooks/hook_frontpage.php
index b6a2f73ebd33c98051c008a2f92e175b35479fe4..825917320dbb0db77470dbd9c104cd0968e43c48 100644
--- a/modules/statistics/hooks/hook_frontpage.php
+++ b/modules/statistics/hooks/hook_frontpage.php
@@ -20,4 +20,3 @@ function statistics_hook_frontpage(&$links) {
 	);
 
 }
-?>
\ No newline at end of file
diff --git a/modules/statistics/hooks/hook_sanitycheck.php b/modules/statistics/hooks/hook_sanitycheck.php
index ab10ea38159425df8210bfdc914d9069e0e6a6d8..236802c48ef15003cd4acfe839f663b011e284f8 100644
--- a/modules/statistics/hooks/hook_sanitycheck.php
+++ b/modules/statistics/hooks/hook_sanitycheck.php
@@ -36,4 +36,3 @@ function statistics_hook_sanitycheck(&$hookinfo) {
 		$hookinfo['errors'][] = '[statistics] Input file [' . $inputfile . '] does not exists';
 	}
 }
-?>
\ No newline at end of file
diff --git a/modules/statistics/lib/Graph/GoogleCharts.php b/modules/statistics/lib/Graph/GoogleCharts.php
index df36bb172de9285dbdbc5c2ac2faa9552fd5a6ee..385068ef8c3e9ebe581274a0d04ed01890ed1f51 100644
--- a/modules/statistics/lib/Graph/GoogleCharts.php
+++ b/modules/statistics/lib/Graph/GoogleCharts.php
@@ -180,5 +180,3 @@ class sspmod_statistics_Graph_GoogleCharts {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/statistics/lib/LogCleaner.php b/modules/statistics/lib/LogCleaner.php
index ed55ad98b8b15c2d9e461e50c012115d666de372..55c7493e54abbf648b1af284b0fc33e790ae9061 100644
--- a/modules/statistics/lib/LogCleaner.php
+++ b/modules/statistics/lib/LogCleaner.php
@@ -173,5 +173,3 @@ class sspmod_statistics_LogCleaner {
 
 
 }
-
-?>
\ No newline at end of file
diff --git a/modules/statistics/lib/LogParser.php b/modules/statistics/lib/LogParser.php
index b9a88805e894848af1d25e71d82a9905fd4c8ef5..d0d54ca076ef156a47039173c9b61f57bee6d8ef 100644
--- a/modules/statistics/lib/LogParser.php
+++ b/modules/statistics/lib/LogParser.php
@@ -68,5 +68,3 @@ class sspmod_statistics_LogParser {
 
 
 }
-
-?>
\ No newline at end of file
diff --git a/templates/attributequery.php b/templates/attributequery.php
index 9eb276be8242fb47e9d0c53911299575b14fc4bb..fc1459071618f9fc997321aa9d9f08a77e876b3d 100644
--- a/templates/attributequery.php
+++ b/templates/attributequery.php
@@ -78,4 +78,4 @@ if ($attributes !== NULL) {
 }
 ?>
 
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/templates/error.php b/templates/error.php
index b4358af42b6628493bc529f5e801b56fa67014a7..d8e7b38cba4c52eda8e816ff49a6877f78338fd9 100644
--- a/templates/error.php
+++ b/templates/error.php
@@ -69,4 +69,4 @@ if (isset($this->data['errorReportAddress'])) {
 <p><?php echo $this->t('howto_text'); ?></p>
 
 
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/templates/errorreport.php b/templates/errorreport.php
index c6d22cc7f44df8e4d4f15f1eacc6e8e44293c951..278d483856938f92c89221463bc90e8c3a16ca35 100644
--- a/templates/errorreport.php
+++ b/templates/errorreport.php
@@ -6,4 +6,4 @@
 
 <h2><?php echo $this->t('errorreport_header'); ?></h2>
 <p><?php echo $this->t('errorreport_text'); ?></p>
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/templates/login.php b/templates/login.php
index 83dacd246c6a510254ce6d0086ff413f8c18dd2d..cd4aaa64475850c5e985a57402d75e7782e3a647 100644
--- a/templates/login.php
+++ b/templates/login.php
@@ -68,4 +68,4 @@
 	<p class="logintext"><?php echo $this->t('help_text'); ?></p>
 	
 
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/templates/logout.php b/templates/logout.php
index 8ce3f71b548187582999b0bcae41a79909874a79..885f3a54b768a42900159dde64c032421de88500 100644
--- a/templates/logout.php
+++ b/templates/logout.php
@@ -16,5 +16,3 @@ echo('<p>[ <a href="' . htmlspecialchars($this->data['link']) . '">' .
 	htmlspecialchars($this->data['text']) . '</a> ]</p>');
 
 $this->includeAtTemplateBase('includes/footer.php');
-
-?>
\ No newline at end of file
diff --git a/templates/metadata-converter.php b/templates/metadata-converter.php
index f8b17c114200d5c79d7df16d14c21c41db1880ac..ae95982b296d6c73dd3ac9135adb253d93a831da 100644
--- a/templates/metadata-converter.php
+++ b/templates/metadata-converter.php
@@ -40,4 +40,3 @@ if($output !== NULL) {
 
 <?php
 $this->includeAtTemplateBase('includes/footer.php');
-?>
\ No newline at end of file
diff --git a/templates/metadata.php b/templates/metadata.php
index 3d2ca520f921976cc7dbc9bc70049a824c37634d..e4f9471cb6c925bea63fc870df7ab91a70b59184 100644
--- a/templates/metadata.php
+++ b/templates/metadata.php
@@ -48,4 +48,4 @@ if(array_key_exists('available_certs', $this->data)) {	?>
 		
 
 
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/templates/selectidp-dropdown.php b/templates/selectidp-dropdown.php
index 3d8e24a001b9d656dafce91fa354e316a3436c77..e967353c2d24b899fe3103eaaa28818eafb5404c 100644
--- a/templates/selectidp-dropdown.php
+++ b/templates/selectidp-dropdown.php
@@ -60,4 +60,4 @@ foreach ($this->data['idplist'] AS $idpentry) {
 		</form>
 
 		
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/templates/selectidp-links.php b/templates/selectidp-links.php
index 85aa3ca8bc57c7cf54c12cfb07238f01133756d7..c513838fb6d5c41014d9c957fd75a24a830c8230 100644
--- a/templates/selectidp-links.php
+++ b/templates/selectidp-links.php
@@ -83,4 +83,4 @@ foreach ($this->data['idplist'] AS $idpentry) {
 		?>
 		</form>
 		
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/templates/status.php b/templates/status.php
index b3bd0e367d65583c81798a5031b12bdc170e91fb..e4046d651ef64fff45c7af26cf2de9d5eaacb79d 100644
--- a/templates/status.php
+++ b/templates/status.php
@@ -124,4 +124,4 @@ if (isset($this->data['logouturl'])) {
 	<h2><?php echo $this->t('{core:frontpage:about_header}'); ?></h2>
 	<p><?php echo $this->t('{core:frontpage:about_text}'); ?></p>
 	
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
+<?php $this->includeAtTemplateBase('includes/footer.php');