From 3d7d094d01bdf5c2b02ddc3ad2016027e0bec2ea Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Thu, 10 Sep 2020 18:08:25 +0200
Subject: [PATCH] Remove all @author tags; we have Git history

---
 lib/SimpleSAML/Auth/ProcessingChain.php       |  1 -
 lib/SimpleSAML/Auth/ProcessingFilter.php      |  1 -
 lib/SimpleSAML/Auth/Source.php                |  1 -
 lib/SimpleSAML/Auth/State.php                 |  3 --
 lib/SimpleSAML/Configuration.php              |  1 -
 lib/SimpleSAML/Database.php                   |  1 -
 lib/SimpleSAML/Error/Assertion.php            |  1 -
 lib/SimpleSAML/Error/BadRequest.php           |  1 -
 lib/SimpleSAML/Error/BadUserInput.php         |  1 -
 lib/SimpleSAML/Error/CannotSetCookie.php      |  1 -
 lib/SimpleSAML/Error/ConfigurationError.php   |  1 -
 .../Error/CriticalConfigurationError.php      |  1 -
 lib/SimpleSAML/Error/Error.php                |  1 -
 lib/SimpleSAML/Error/ErrorCodes.php           |  1 -
 lib/SimpleSAML/Error/Exception.php            |  1 -
 lib/SimpleSAML/Error/InvalidCredential.php    |  1 -
 lib/SimpleSAML/Error/NotFound.php             |  1 -
 lib/SimpleSAML/Error/User.php                 |  1 -
 lib/SimpleSAML/Error/UserNotFound.php         |  1 -
 lib/SimpleSAML/Locale/Language.php            |  2 -
 lib/SimpleSAML/Locale/Localization.php        |  1 -
 lib/SimpleSAML/Locale/Translate.php           |  2 -
 lib/SimpleSAML/Logger.php                     |  3 --
 .../Logger/ErrorLogLoggingHandler.php         |  3 --
 lib/SimpleSAML/Logger/FileLoggingHandler.php  |  2 -
 .../Logger/LoggingHandlerInterface.php        |  1 -
 .../Logger/StandardErrorLoggingHandler.php    |  1 -
 .../Logger/SyslogLoggingHandler.php           |  2 -
 lib/SimpleSAML/Memcache.php                   |  1 -
 .../Metadata/MetaDataStorageHandler.php       |  1 -
 .../MetaDataStorageHandlerFlatFile.php        |  1 -
 .../Metadata/MetaDataStorageHandlerXML.php    |  1 -
 .../Metadata/MetaDataStorageSource.php        |  2 -
 lib/SimpleSAML/Metadata/Signer.php            |  1 -
 lib/SimpleSAML/Metadata/Sources/MDQ.php       |  3 --
 lib/SimpleSAML/Module.php                     |  3 --
 lib/SimpleSAML/Session.php                    |  2 -
 lib/SimpleSAML/SessionHandler.php             |  1 -
 lib/SimpleSAML/SessionHandlerCookie.php       |  1 -
 lib/SimpleSAML/SessionHandlerPHP.php          |  1 -
 lib/SimpleSAML/Utils/Arrays.php               |  3 --
 lib/SimpleSAML/Utils/Attributes.php           |  3 --
 lib/SimpleSAML/Utils/Auth.php                 |  3 --
 lib/SimpleSAML/Utils/Config.php               |  2 -
 lib/SimpleSAML/Utils/Config/Metadata.php      |  2 -
 lib/SimpleSAML/Utils/Crypto.php               | 12 -----
 lib/SimpleSAML/Utils/EMail.php                |  1 -
 lib/SimpleSAML/Utils/HTTP.php                 | 47 -------------------
 lib/SimpleSAML/Utils/Net.php                  |  4 --
 lib/SimpleSAML/Utils/Random.php               |  3 --
 lib/SimpleSAML/Utils/System.php               | 10 ----
 lib/SimpleSAML/Utils/Time.php                 |  2 -
 lib/SimpleSAML/Utils/XML.php                  |  9 ----
 lib/SimpleSAML/XHTML/IdPDisco.php             |  3 --
 lib/SimpleSAML/XHTML/Template.php             |  1 -
 lib/SimpleSAML/XML/Errors.php                 |  1 -
 lib/SimpleSAML/XML/Parser.php                 |  1 -
 lib/SimpleSAML/XML/Signer.php                 |  1 -
 lib/SimpleSAML/XML/Validator.php              |  1 -
 lib/_autoload.php                             |  1 -
 lib/_autoload_modules.php                     |  2 -
 .../core/lib/Auth/Process/AttributeAdd.php    |  1 -
 .../core/lib/Auth/Process/AttributeAlter.php  |  1 -
 .../core/lib/Auth/Process/AttributeCopy.php   |  1 -
 .../core/lib/Auth/Process/AttributeLimit.php  |  1 -
 .../core/lib/Auth/Process/AttributeMap.php    |  1 -
 .../lib/Auth/Process/AttributeValueMap.php    |  1 -
 modules/core/lib/Auth/Process/Cardinality.php |  1 -
 .../lib/Auth/Process/CardinalitySingle.php    |  1 -
 .../core/lib/Auth/Process/GenerateGroups.php  |  1 -
 .../core/lib/Auth/Process/LanguageAdaptor.php |  1 -
 .../Auth/Process/StatisticsWithAttribute.php  |  1 -
 modules/core/lib/Auth/Process/TargetedID.php  |  1 -
 modules/core/lib/Auth/UserPassBase.php        |  1 -
 modules/core/lib/Auth/UserPassOrgBase.php     |  1 -
 .../core/lib/Storage/SQLPermanentStorage.php  |  1 -
 modules/core/www/loginuserpass.php            |  1 -
 modules/core/www/loginuserpassorg.php         |  1 -
 .../lib/Auth/Source/StaticSource.php          |  1 -
 .../exampleauth/lib/Auth/Source/UserPass.php  |  1 -
 modules/exampleauth/www/redirecttest.php      |  1 -
 .../multiauth/lib/Auth/Source/MultiAuth.php   |  1 -
 modules/multiauth/www/selectsource.php        |  1 -
 .../saml/lib/Auth/Process/FilterScopes.php    |  2 -
 modules/saml/lib/Error/NoAuthnContext.php     |  1 -
 modules/saml/lib/Error/NoAvailableIDP.php     |  1 -
 modules/saml/lib/Error/NoPassive.php          |  1 -
 modules/saml/lib/Error/NoSupportedIDP.php     |  1 -
 modules/saml/lib/Error/ProxyCountExceeded.php |  1 -
 modules/saml/www/proxy/invalid_session.php    |  1 -
 tests/lib/SimpleSAML/DatabaseTest.php         |  1 -
 tests/lib/SimpleSAML/Store/SQLTest.php        |  1 -
 tests/lib/SimpleSAML/StoreTest.php            |  1 -
 tests/lib/SimpleSAML/Utils/AttributesTest.php |  1 -
 tests/lib/SimpleSAML/XML/ErrorsTest.php       |  1 -
 .../lib/Auth/Process/FilterScopesTest.php     |  1 -
 .../lib/Auth/Process/NameIDAttributeTest.php  |  1 -
 tests/modules/saml/lib/IdP/SQLNameIDTest.php  |  1 -
 tests/www/IndexTest.php                       |  1 -
 www/saml2/idp/ArtifactResolutionService.php   |  1 -
 www/saml2/idp/SingleLogoutService.php         |  1 -
 101 files changed, 209 deletions(-)

diff --git a/lib/SimpleSAML/Auth/ProcessingChain.php b/lib/SimpleSAML/Auth/ProcessingChain.php
index a19b4878e..a013b0efa 100644
--- a/lib/SimpleSAML/Auth/ProcessingChain.php
+++ b/lib/SimpleSAML/Auth/ProcessingChain.php
@@ -18,7 +18,6 @@ use SimpleSAML\Utils;
  * submitting a response to a SP. Examples of additional steps can be additional authentication
  * checks, or attribute consent requirements.
  *
- * @author Olav Morken, UNINETT AS.
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/Auth/ProcessingFilter.php b/lib/SimpleSAML/Auth/ProcessingFilter.php
index 038900e5e..548ae0ab8 100644
--- a/lib/SimpleSAML/Auth/ProcessingFilter.php
+++ b/lib/SimpleSAML/Auth/ProcessingFilter.php
@@ -20,7 +20,6 @@ use SimpleSAML\Assert\Assert;
  * information in it, it should have a name on the form 'module:filter:attributename', to avoid name
  * collisions.
  *
- * @author Olav Morken, UNINETT AS.
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/Auth/Source.php b/lib/SimpleSAML/Auth/Source.php
index 691d1fcbe..c41548493 100644
--- a/lib/SimpleSAML/Auth/Source.php
+++ b/lib/SimpleSAML/Auth/Source.php
@@ -17,7 +17,6 @@ use SimpleSAML\Utils;
  *
  * An authentication source is any system which somehow authenticate the user.
  *
- * @author Olav Morken, UNINETT AS.
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/Auth/State.php b/lib/SimpleSAML/Auth/State.php
index accfc8285..03d36efa4 100644
--- a/lib/SimpleSAML/Auth/State.php
+++ b/lib/SimpleSAML/Auth/State.php
@@ -36,7 +36,6 @@ use SimpleSAML\Utils;
  * elements of the state array. Note that internally this uses the request parameter name
  * defined in EXCEPTION_PARAM, which, for technical reasons, cannot contain a ".".
  *
- * @author Olav Morken, UNINETT AS.
  * @package SimpleSAMLphp
  */
 
@@ -404,8 +403,6 @@ class State
      * @return array A hashed array with the ID and the URL (if any), in the 'id' and 'url' keys, respectively. If
      * there's no URL in the input parameter, NULL will be returned as the value for the 'url' key.
      *
-     * @author Andreas Solberg, UNINETT AS <andreas.solberg@uninett.no>
-     * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
      */
     public static function parseStateID(string $stateId): array
     {
diff --git a/lib/SimpleSAML/Configuration.php b/lib/SimpleSAML/Configuration.php
index 73b52aebc..9a908c0c6 100644
--- a/lib/SimpleSAML/Configuration.php
+++ b/lib/SimpleSAML/Configuration.php
@@ -12,7 +12,6 @@ use SimpleSAML\Utils;
 /**
  * Configuration of SimpleSAMLphp
  *
- * @author Andreas Aakre Solberg, UNINETT AS. <andreas.solberg@uninett.no>
  * @package SimpleSAMLphp
  */
 class Configuration implements Utils\ClearableState
diff --git a/lib/SimpleSAML/Database.php b/lib/SimpleSAML/Database.php
index 1823e80bd..8a076654d 100644
--- a/lib/SimpleSAML/Database.php
+++ b/lib/SimpleSAML/Database.php
@@ -20,7 +20,6 @@ use SimpleSAML\Logger;
  * the case of a module that has a good reason to use a different database, such as sqlauth, an alternative config file
  * can be provided.
  *
- * @author Tyler Antonio, University of Alberta. <tantonio@ualberta.ca>
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/Error/Assertion.php b/lib/SimpleSAML/Error/Assertion.php
index ff957ddd6..42cf63563 100644
--- a/lib/SimpleSAML/Error/Assertion.php
+++ b/lib/SimpleSAML/Error/Assertion.php
@@ -9,7 +9,6 @@ use SimpleSAML\Assert\Assert;
 /**
  * Class for creating exceptions from assertion failures.
  *
- * @author Olav Morken, UNINETT AS.
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/Error/BadRequest.php b/lib/SimpleSAML/Error/BadRequest.php
index 0f50939bf..ed491bd0e 100644
--- a/lib/SimpleSAML/Error/BadRequest.php
+++ b/lib/SimpleSAML/Error/BadRequest.php
@@ -12,7 +12,6 @@ use SimpleSAML\Assert\Assert;
  * This exception can be thrown from within an module page handler. The user will then be
  * shown a 400 Bad Request error page.
  *
- * @author Olav Morken, UNINETT AS.
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/Error/BadUserInput.php b/lib/SimpleSAML/Error/BadUserInput.php
index 427bf85a9..e104c1217 100644
--- a/lib/SimpleSAML/Error/BadUserInput.php
+++ b/lib/SimpleSAML/Error/BadUserInput.php
@@ -7,7 +7,6 @@ namespace SimpleSAML\Error;
 /**
  * Exception indicating illegal innput from user.
  *
- * @author Thomas Graff <thomas.graff@uninett.no>
  * @package SimpleSAMLphp_base
  *
  */
diff --git a/lib/SimpleSAML/Error/CannotSetCookie.php b/lib/SimpleSAML/Error/CannotSetCookie.php
index 3c4faa810..48a207995 100644
--- a/lib/SimpleSAML/Error/CannotSetCookie.php
+++ b/lib/SimpleSAML/Error/CannotSetCookie.php
@@ -7,7 +7,6 @@ namespace SimpleSAML\Error;
 /**
  * Exception to indicate that we cannot set a cookie.
  *
- * @author Jaime Pérez Crespo <jaime.perez@uninett.no>
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/Error/ConfigurationError.php b/lib/SimpleSAML/Error/ConfigurationError.php
index 66032f46b..4fdcdded3 100644
--- a/lib/SimpleSAML/Error/ConfigurationError.php
+++ b/lib/SimpleSAML/Error/ConfigurationError.php
@@ -7,7 +7,6 @@ namespace SimpleSAML\Error;
 /**
  * This exception represents a configuration error.
  *
- * @author Jaime Perez Crespo, UNINETT AS <jaime.perez@uninett.no>
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/Error/CriticalConfigurationError.php b/lib/SimpleSAML/Error/CriticalConfigurationError.php
index dd02e8cbd..14907a5ab 100644
--- a/lib/SimpleSAML/Error/CriticalConfigurationError.php
+++ b/lib/SimpleSAML/Error/CriticalConfigurationError.php
@@ -24,7 +24,6 @@ use Throwable;
  * certain point and inform about the error in an ordered manner, without blank pages, logs out of place or even
  * segfaults.
  *
- * @author Jaime Perez Crespo, UNINETT AS <jaime.perez@uninett.no>
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/Error/Error.php b/lib/SimpleSAML/Error/Error.php
index a54075dd8..f5285716c 100644
--- a/lib/SimpleSAML/Error/Error.php
+++ b/lib/SimpleSAML/Error/Error.php
@@ -15,7 +15,6 @@ use Throwable;
 /**
  * Class that wraps SimpleSAMLphp errors in exceptions.
  *
- * @author Olav Morken, UNINETT AS.
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/Error/ErrorCodes.php b/lib/SimpleSAML/Error/ErrorCodes.php
index 049aeaddd..f581cef8f 100644
--- a/lib/SimpleSAML/Error/ErrorCodes.php
+++ b/lib/SimpleSAML/Error/ErrorCodes.php
@@ -9,7 +9,6 @@ use SimpleSAML\Locale\Translate;
 /**
  * Class that maps SimpleSAMLphp error codes to translateable strings.
  *
- * @author Hanne Moa, UNINETT AS. <hanne.moa@uninett.no>
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/Error/Exception.php b/lib/SimpleSAML/Error/Exception.php
index 4b853e89c..ce1cae1d6 100644
--- a/lib/SimpleSAML/Error/Exception.php
+++ b/lib/SimpleSAML/Error/Exception.php
@@ -14,7 +14,6 @@ use Throwable;
  *
  * This class tries to make sure that every exception is serializable.
  *
- * @author Thomas Graff <thomas.graff@uninett.no>
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/Error/InvalidCredential.php b/lib/SimpleSAML/Error/InvalidCredential.php
index 35b991ef0..ffb57048c 100644
--- a/lib/SimpleSAML/Error/InvalidCredential.php
+++ b/lib/SimpleSAML/Error/InvalidCredential.php
@@ -7,7 +7,6 @@ namespace SimpleSAML\Error;
 /**
  * Exception indicating wrong password given by user.
  *
- * @author Thomas Graff <thomas.graff@uninett.no>
  * @package SimpleSAMLphp_base
  *
  */
diff --git a/lib/SimpleSAML/Error/NotFound.php b/lib/SimpleSAML/Error/NotFound.php
index 02b65ac32..af96fc5f6 100644
--- a/lib/SimpleSAML/Error/NotFound.php
+++ b/lib/SimpleSAML/Error/NotFound.php
@@ -13,7 +13,6 @@ use SimpleSAML\Utils;
  * This exception can be thrown from within a module page handler. The user will then be shown a 404 Not Found error
  * page.
  *
- * @author Olav Morken, UNINETT AS.
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/Error/User.php b/lib/SimpleSAML/Error/User.php
index 4f90141b4..99823d51d 100644
--- a/lib/SimpleSAML/Error/User.php
+++ b/lib/SimpleSAML/Error/User.php
@@ -8,7 +8,6 @@ namespace SimpleSAML\Error;
  * Baseclass for user error exceptions
  *
  *
- * @author Thomas Graff <thomas.graff@uninett.no>
  * @package SimpleSAMLphp_base
  *
  */
diff --git a/lib/SimpleSAML/Error/UserNotFound.php b/lib/SimpleSAML/Error/UserNotFound.php
index a381beed2..c1085be1a 100644
--- a/lib/SimpleSAML/Error/UserNotFound.php
+++ b/lib/SimpleSAML/Error/UserNotFound.php
@@ -7,7 +7,6 @@ namespace SimpleSAML\Error;
 /**
  * Exception indicating user not found by authsource.
  *
- * @author Thomas Graff <thomas.graff@uninett.no>
  * @package SimpleSAMLphp_base
  *
  */
diff --git a/lib/SimpleSAML/Locale/Language.php b/lib/SimpleSAML/Locale/Language.php
index ac9ae56fc..04280d9ad 100644
--- a/lib/SimpleSAML/Locale/Language.php
+++ b/lib/SimpleSAML/Locale/Language.php
@@ -3,8 +3,6 @@
 /**
  * Choosing the language to localize to for our minimalistic XHTML PHP based template system.
  *
- * @author Andreas Ă…kre Solberg, UNINETT AS. <andreas.solberg@uninett.no>
- * @author Hanne Moa, UNINETT AS. <hanne.moa@uninett.no>
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/Locale/Localization.php b/lib/SimpleSAML/Locale/Localization.php
index ef76a1f4f..776b10ddc 100644
--- a/lib/SimpleSAML/Locale/Localization.php
+++ b/lib/SimpleSAML/Locale/Localization.php
@@ -3,7 +3,6 @@
 /**
  * Glue to connect one or more translation/locale systems to the rest
  *
- * @author Hanne Moa, UNINETT AS. <hanne.moa@uninett.no>
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/Locale/Translate.php b/lib/SimpleSAML/Locale/Translate.php
index 8b5bb09bd..0413fd097 100644
--- a/lib/SimpleSAML/Locale/Translate.php
+++ b/lib/SimpleSAML/Locale/Translate.php
@@ -3,8 +3,6 @@
 /**
  * The translation-relevant bits from our original minimalistic XHTML PHP based template system.
  *
- * @author Andreas Ă…kre Solberg, UNINETT AS. <andreas.solberg@uninett.no>
- * @author Hanne Moa, UNINETT AS. <hanne.moa@uninett.no>
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/Logger.php b/lib/SimpleSAML/Logger.php
index 10f237837..9d0a82fb9 100644
--- a/lib/SimpleSAML/Logger.php
+++ b/lib/SimpleSAML/Logger.php
@@ -15,9 +15,6 @@ use SimpleSAML\Logger\SyslogLoggingHandler;
 /**
  * The main logger class for SimpleSAMLphp.
  *
- * @author Lasse Birnbaum Jensen, SDU.
- * @author Andreas Ă…kre Solberg, UNINETT AS. <andreas.solberg@uninett.no>
- * @author Jaime Pérez Crespo, UNINETT AS <jaime.perez@uninett.no>
  * @package SimpleSAMLphp
  */
 class Logger
diff --git a/lib/SimpleSAML/Logger/ErrorLogLoggingHandler.php b/lib/SimpleSAML/Logger/ErrorLogLoggingHandler.php
index 4806dab9b..fe5d4baff 100644
--- a/lib/SimpleSAML/Logger/ErrorLogLoggingHandler.php
+++ b/lib/SimpleSAML/Logger/ErrorLogLoggingHandler.php
@@ -10,9 +10,6 @@ use SimpleSAML\Logger;
 /**
  * A class for logging to the default php error log.
  *
- * @author Lasse Birnbaum Jensen, SDU.
- * @author Andreas Ă…kre Solberg, UNINETT AS. <andreas.solberg@uninett.no>
- * @author Olav Morken, UNINETT AS.
  * @package SimpleSAMLphp
  */
 class ErrorLogLoggingHandler implements LoggingHandlerInterface
diff --git a/lib/SimpleSAML/Logger/FileLoggingHandler.php b/lib/SimpleSAML/Logger/FileLoggingHandler.php
index 9f912b1a8..a7bbe37cb 100644
--- a/lib/SimpleSAML/Logger/FileLoggingHandler.php
+++ b/lib/SimpleSAML/Logger/FileLoggingHandler.php
@@ -11,8 +11,6 @@ use SimpleSAML\Utils;
 /**
  * A logging handler that dumps logs to files.
  *
- * @author Lasse Birnbaum Jensen, SDU.
- * @author Andreas Ă…kre Solberg, UNINETT AS. <andreas.solberg@uninett.no>
  * @package SimpleSAMLphp
  */
 class FileLoggingHandler implements LoggingHandlerInterface
diff --git a/lib/SimpleSAML/Logger/LoggingHandlerInterface.php b/lib/SimpleSAML/Logger/LoggingHandlerInterface.php
index 7dbb7789b..8874c2939 100644
--- a/lib/SimpleSAML/Logger/LoggingHandlerInterface.php
+++ b/lib/SimpleSAML/Logger/LoggingHandlerInterface.php
@@ -9,7 +9,6 @@ use SimpleSAML\Configuration;
 /**
  * The interface that must be implemented by any log handler.
  *
- * @author Jaime Perez Crespo, UNINETT AS.
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/Logger/StandardErrorLoggingHandler.php b/lib/SimpleSAML/Logger/StandardErrorLoggingHandler.php
index 02b31eab8..c6860a2a2 100644
--- a/lib/SimpleSAML/Logger/StandardErrorLoggingHandler.php
+++ b/lib/SimpleSAML/Logger/StandardErrorLoggingHandler.php
@@ -9,7 +9,6 @@ use SimpleSAML\Configuration;
 /**
  * A logging handler that outputs all messages to standard error.
  *
- * @author Jaime Perez Crespo, UNINETT AS <jaime.perez@uninett.no>
  * @package SimpleSAMLphp
  */
 class StandardErrorLoggingHandler extends FileLoggingHandler
diff --git a/lib/SimpleSAML/Logger/SyslogLoggingHandler.php b/lib/SimpleSAML/Logger/SyslogLoggingHandler.php
index bba5e48e7..efa7ed232 100644
--- a/lib/SimpleSAML/Logger/SyslogLoggingHandler.php
+++ b/lib/SimpleSAML/Logger/SyslogLoggingHandler.php
@@ -10,8 +10,6 @@ use SimpleSAML\Utils;
 /**
  * A logger that sends messages to syslog.
  *
- * @author Lasse Birnbaum Jensen, SDU.
- * @author Andreas Ă…kre Solberg, UNINETT AS. <andreas.solberg@uninett.no>
  * @package SimpleSAMLphp
  */
 class SyslogLoggingHandler implements LoggingHandlerInterface
diff --git a/lib/SimpleSAML/Memcache.php b/lib/SimpleSAML/Memcache.php
index adb3ab0ed..f69e4d83b 100644
--- a/lib/SimpleSAML/Memcache.php
+++ b/lib/SimpleSAML/Memcache.php
@@ -19,7 +19,6 @@ use SimpleSAML\Utils;
  * have the same clock (as measured by the time()-function). Different clock
  * values will lead to incorrect behaviour.
  *
- * @author Olav Morken, UNINETT AS.
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageHandler.php b/lib/SimpleSAML/Metadata/MetaDataStorageHandler.php
index 6310a62eb..d4f86e551 100644
--- a/lib/SimpleSAML/Metadata/MetaDataStorageHandler.php
+++ b/lib/SimpleSAML/Metadata/MetaDataStorageHandler.php
@@ -17,7 +17,6 @@ use SimpleSAML\Utils\ClearableState;
 /**
  * This file defines a class for metadata handling.
  *
- * @author Andreas Ă…kre Solberg, UNINETT AS. <andreas.solberg@uninett.no>
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php
index ed0a4e267..f40fa5400 100644
--- a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php
+++ b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php
@@ -12,7 +12,6 @@ use SimpleSAML\Configuration;
  * Instantiation of session handler objects should be done through
  * the class method getMetadataHandler().
  *
- * @author Andreas Ă…kre Solberg, UNINETT AS. <andreas.solberg@uninett.no>
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerXML.php b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerXML.php
index c4707f4b5..8ce1a288b 100644
--- a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerXML.php
+++ b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerXML.php
@@ -10,7 +10,6 @@ use SimpleSAML\Configuration;
  * This class implements a metadata source which loads metadata from XML files.
  * The XML files should be in the SAML 2.0 metadata format.
  *
- * @author Olav Morken, UNINETT AS.
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageSource.php b/lib/SimpleSAML/Metadata/MetaDataStorageSource.php
index 7edbdcbd1..bf7a425bc 100644
--- a/lib/SimpleSAML/Metadata/MetaDataStorageSource.php
+++ b/lib/SimpleSAML/Metadata/MetaDataStorageSource.php
@@ -16,8 +16,6 @@ use SimpleSAML\Utils;
  * A metadata storage source can be loaded by passing the configuration of it
  * to the getSource static function.
  *
- * @author Olav Morken, UNINETT AS.
- * @author Andreas Aakre Solberg, UNINETT AS.
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/Metadata/Signer.php b/lib/SimpleSAML/Metadata/Signer.php
index ca358c124..7d5d6a0a8 100644
--- a/lib/SimpleSAML/Metadata/Signer.php
+++ b/lib/SimpleSAML/Metadata/Signer.php
@@ -14,7 +14,6 @@ use SimpleSAML\Utils;
 /**
  * This class implements a helper function for signing of metadata.
  *
- * @author Olav Morken, UNINETT AS.
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/Metadata/Sources/MDQ.php b/lib/SimpleSAML/Metadata/Sources/MDQ.php
index 98430d5e0..923cca2a9 100644
--- a/lib/SimpleSAML/Metadata/Sources/MDQ.php
+++ b/lib/SimpleSAML/Metadata/Sources/MDQ.php
@@ -15,9 +15,6 @@ use SimpleSAML\Utils;
 /**
  * This class implements SAML Metadata Query Protocol
  *
- * @author Andreas Ă…kre Solberg, UNINETT AS.
- * @author Olav Morken, UNINETT AS.
- * @author Tamas Frank, NIIFI
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/Module.php b/lib/SimpleSAML/Module.php
index 0851b23ce..6f1591296 100644
--- a/lib/SimpleSAML/Module.php
+++ b/lib/SimpleSAML/Module.php
@@ -18,9 +18,6 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * Helper class for accessing information about modules.
  *
- * @author Olav Morken <olav.morken@uninett.no>, UNINETT AS.
- * @author Boy Baukema, SURFnet.
- * @author Jaime Perez <jaime.perez@uninett.no>, UNINETT AS.
  * @package SimpleSAMLphp
  */
 class Module
diff --git a/lib/SimpleSAML/Session.php b/lib/SimpleSAML/Session.php
index 78ada3274..3d49f0faa 100644
--- a/lib/SimpleSAML/Session.php
+++ b/lib/SimpleSAML/Session.php
@@ -23,8 +23,6 @@ use SimpleSAML\Utils;
  * that is not serializable, make sure to convert it first to a representation that can be
  * serialized.
  *
- * @author Andreas Ă…kre Solberg, UNINETT AS. <andreas.solberg@uninett.no>
- * @author Jaime Pérez Crespo, UNINETT AS <jaime.perez@uninett.no>
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/SessionHandler.php b/lib/SimpleSAML/SessionHandler.php
index 7fcf4b95e..1ec01461b 100644
--- a/lib/SimpleSAML/SessionHandler.php
+++ b/lib/SimpleSAML/SessionHandler.php
@@ -8,7 +8,6 @@
  * Instantiation of session handler objects should be done through
  * the class method getSessionHandler().
  *
- * @author Olav Morken, UNINETT AS. <andreas.solberg@uninett.no>
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/SessionHandlerCookie.php b/lib/SimpleSAML/SessionHandlerCookie.php
index 7384544c6..30a5880e2 100644
--- a/lib/SimpleSAML/SessionHandlerCookie.php
+++ b/lib/SimpleSAML/SessionHandlerCookie.php
@@ -6,7 +6,6 @@
  * This file defines a base class for session handlers that need to store the session id in a cookie. It takes care of
  * storing and retrieving the session id.
  *
- * @author Olav Morken, UNINETT AS. <andreas.solberg@uninett.no>
  * @package SimpleSAMLphp
  * @abstract
  */
diff --git a/lib/SimpleSAML/SessionHandlerPHP.php b/lib/SimpleSAML/SessionHandlerPHP.php
index 8a960bfab..5a8146bbd 100644
--- a/lib/SimpleSAML/SessionHandlerPHP.php
+++ b/lib/SimpleSAML/SessionHandlerPHP.php
@@ -5,7 +5,6 @@
  *
  * This file defines a session handler which uses the default php session handler for storage.
  *
- * @author Olav Morken, UNINETT AS. <andreas.solberg@uninett.no>
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/Utils/Arrays.php b/lib/SimpleSAML/Utils/Arrays.php
index 0f9bd90ad..b667a7fe4 100644
--- a/lib/SimpleSAML/Utils/Arrays.php
+++ b/lib/SimpleSAML/Utils/Arrays.php
@@ -20,8 +20,6 @@ class Arrays
      * @return array An array with one element containing $data, with key $index, or $data itself if it's already an
      *     array.
      *
-     * @author Andreas Solberg, UNINETT AS <andreas.solberg@uninett.no>
-     * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
      */
     public static function arrayize($data, $index = 0): array
     {
@@ -36,7 +34,6 @@ class Arrays
      *
      * @return array|false The transposed array, or false if $array is not a valid two-dimensional array.
      *
-     * @author Andreas Solberg, UNINETT AS <andreas.solberg@uninett.no>
      */
     public static function transpose(array $array)
     {
diff --git a/lib/SimpleSAML/Utils/Attributes.php b/lib/SimpleSAML/Utils/Attributes.php
index 837a7e1d8..047efd522 100644
--- a/lib/SimpleSAML/Utils/Attributes.php
+++ b/lib/SimpleSAML/Utils/Attributes.php
@@ -9,7 +9,6 @@ use SimpleSAML\Error;
 /**
  * Attribute-related utility methods.
  *
- * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
  * @package SimpleSAML
  */
 
@@ -66,8 +65,6 @@ class Attributes
      * @throws \InvalidArgumentException If input is not an array, array keys are not strings or attribute values are
      *     not strings.
      *
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
-     * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
      */
     public static function normalizeAttributesArray(array $attributes): array
     {
diff --git a/lib/SimpleSAML/Utils/Auth.php b/lib/SimpleSAML/Utils/Auth.php
index 285b87ec3..6461511a4 100644
--- a/lib/SimpleSAML/Utils/Auth.php
+++ b/lib/SimpleSAML/Utils/Auth.php
@@ -54,7 +54,6 @@ class Auth
      *
      * @return boolean True if the current user is an admin user, false otherwise.
      *
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
      */
     public static function isAdmin(): bool
     {
@@ -72,8 +71,6 @@ class Auth
      * @return void This function will only return if the user is admin.
      * @throws \SimpleSAML\Error\Exception If no "admin" authentication source was configured.
      *
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
-     * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
      */
     public static function requireAdmin(): void
     {
diff --git a/lib/SimpleSAML/Utils/Config.php b/lib/SimpleSAML/Utils/Config.php
index 4d7baf293..6e4c029f6 100644
--- a/lib/SimpleSAML/Utils/Config.php
+++ b/lib/SimpleSAML/Utils/Config.php
@@ -21,7 +21,6 @@ class Config
      * @return string  The file path.
      * @throws \InvalidArgumentException If $path is not a string.
      *
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
      */
     public static function getCertPath(string $path): string
     {
@@ -44,7 +43,6 @@ class Config
      * @return string The secret salt.
      * @throws \InvalidArgumentException If the secret salt hasn't been configured.
      *
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
      */
     public static function getSecretSalt(): string
     {
diff --git a/lib/SimpleSAML/Utils/Config/Metadata.php b/lib/SimpleSAML/Utils/Config/Metadata.php
index 8bfc5471e..e4c66ee21 100644
--- a/lib/SimpleSAML/Utils/Config/Metadata.php
+++ b/lib/SimpleSAML/Utils/Config/Metadata.php
@@ -12,7 +12,6 @@ use SimpleSAML\Logger;
  * Class with utilities to fetch different configuration objects from metadata configuration arrays.
  *
  * @package SimpleSAMLphp
- * @author Jaime Pérez Crespo, UNINETT AS <jaime.perez@uninett.no>
  */
 class Metadata
 {
@@ -240,7 +239,6 @@ class Metadata
      *
      * @return array|NULL The default endpoint, or null if no acceptable endpoints are used.
      *
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
      */
     public static function getDefaultEndpoint(array $endpoints, array $bindings = null): ?array
     {
diff --git a/lib/SimpleSAML/Utils/Crypto.php b/lib/SimpleSAML/Utils/Crypto.php
index c8089aab5..79d7f8149 100644
--- a/lib/SimpleSAML/Utils/Crypto.php
+++ b/lib/SimpleSAML/Utils/Crypto.php
@@ -77,8 +77,6 @@ class Crypto
      * @throws \InvalidArgumentException If $ciphertext is not a string.
      * @throws Error\Exception If the openssl module is not loaded.
      *
-     * @author Andreas Solberg, UNINETT AS <andreas.solberg@uninett.no>
-     * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
      */
     public static function aesDecrypt(string $ciphertext): string
     {
@@ -137,8 +135,6 @@ class Crypto
      * @throws \InvalidArgumentException If $data is not a string.
      * @throws Error\Exception If the openssl module is not loaded.
      *
-     * @author Andreas Solberg, UNINETT AS <andreas.solberg@uninett.no>
-     * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
      */
     public static function aesEncrypt(string $data): string
     {
@@ -186,8 +182,6 @@ class Crypto
      * @throws Error\Exception If no private key is found in the metadata, or it was not possible to load
      *     it.
      *
-     * @author Andreas Solberg, UNINETT AS <andreas.solberg@uninett.no>
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
      */
     public static function loadPrivateKey(
         Configuration $metadata,
@@ -248,9 +242,6 @@ class Crypto
      * @throws Error\Exception If no public key is found in the metadata, or it was not possible to load
      *     it.
      *
-     * @author Andreas Solberg, UNINETT AS <andreas.solberg@uninett.no>
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
-     * @author Lasse Birnbaum Jensen
      */
     public static function loadPublicKey(Configuration $metadata, bool $required = false, string $prefix = ''): ?array
     {
@@ -325,8 +316,6 @@ class Crypto
      *
      * @see hash_algos()
      *
-     * @author Dyonisius Visser, TERENA <visser@terena.org>
-     * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
      */
     public static function pwHash(string $password, $algorithm = PASSWORD_DEFAULT): string
     {
@@ -364,7 +353,6 @@ class Crypto
      * @throws \InvalidArgumentException If the input parameters are not strings.
      * @throws Error\Exception If the algorithm specified is not supported.
      *
-     * @author Dyonisius Visser, TERENA <visser@terena.org>
      */
     public static function pwValid(string $hash, string $password): bool
     {
diff --git a/lib/SimpleSAML/Utils/EMail.php b/lib/SimpleSAML/Utils/EMail.php
index b3cc46631..9d435c7fe 100644
--- a/lib/SimpleSAML/Utils/EMail.php
+++ b/lib/SimpleSAML/Utils/EMail.php
@@ -14,7 +14,6 @@ use SimpleSAML\XHTML\Template;
  * E-mailer class that can generate a formatted e-mail from array
  * input data.
  *
- * @author Jørn Åne de Jong, Uninett AS <jorn.dejong@uninett.no>
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/Utils/HTTP.php b/lib/SimpleSAML/Utils/HTTP.php
index 033693bb8..c1714ad9d 100644
--- a/lib/SimpleSAML/Utils/HTTP.php
+++ b/lib/SimpleSAML/Utils/HTTP.php
@@ -27,7 +27,6 @@ class HTTP
      * @throws Error\Exception If the current session is transient.
      * @return string  A URL which allows to securely post a form to $destination.
      *
-     * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
      */
     private static function getSecurePOSTRedirectURL(string $destination, array $data): string
     {
@@ -56,7 +55,6 @@ class HTTP
      * @return string The current host name, including the port if needed. It will use localhost when unable to
      *     determine the current host.
      *
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
      */
     private static function getServerHost(): string
     {
@@ -86,7 +84,6 @@ class HTTP
      *
      * @return boolean True if the request was performed through HTTPS, false otherwise.
      *
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
      */
     public static function getServerHTTPS(): bool
     {
@@ -111,7 +108,6 @@ class HTTP
      * @return string The port number prepended by a colon, if it is different than the default port for the protocol
      *     (80 for HTTP, 443 for HTTPS), or an empty string otherwise.
      *
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
      */
     public static function getServerPort(): string
     {
@@ -169,9 +165,6 @@ class HTTP
      * @throws \InvalidArgumentException If $url is not a string or is empty, or $parameters is not an array.
      * @throws \SimpleSAML\Error\Exception If $url is not a valid HTTP URL.
      *
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
-     * @author Mads Freek Petersen
-     * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
      */
     private static function redirect(string $url, array $parameters = []): void
     {
@@ -246,8 +239,6 @@ class HTTP
      *
      * @return string A random identifier that can be used to retrieve the data from the current session.
      *
-     * @author Andjelko Horvat
-     * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
      */
     private static function savePOSTData(Session $session, string $destination, array $data): string
     {
@@ -275,8 +266,6 @@ class HTTP
      * @return string The URL with the new query parameters.
      * @throws \InvalidArgumentException If $url is not a string or $parameters is not an array.
      *
-     * @author Andreas Solberg, UNINETT AS <andreas.solberg@uninett.no>
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
      */
     public static function addURLParameters(string $url, array $parameters): string
     {
@@ -310,7 +299,6 @@ class HTTP
      *     page telling about the missing cookie.
      * @throws \InvalidArgumentException If $retryURL is neither a string nor null.
      *
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
      */
     public static function checkSessionCookie(?string $retryURL = null): void
     {
@@ -341,7 +329,6 @@ class HTTP
      * @throws \InvalidArgumentException If the URL is malformed.
      * @throws Error\Exception If the URL is not allowed by configuration.
      *
-     * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
      */
     public static function checkURLAllowed(string $url, array $trustedSites = null): string
     {
@@ -431,9 +418,6 @@ class HTTP
      * @throws \InvalidArgumentException If the input parameters are invalid.
      * @throws Error\Exception If the file or URL cannot be retrieved.
      *
-     * @author Andjelko Horvat
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
-     * @author Marco Ferrante, University of Genova <marco@csita.unige.it>
      */
     public static function fetch(string $url, array $context = [], bool $getHeaders = false)
     {
@@ -520,7 +504,6 @@ class HTTP
      *
      * @return array An associative array with each language and the score for that language.
      *
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
      */
     public static function getAcceptLanguage(): array
     {
@@ -619,7 +602,6 @@ class HTTP
      * @return string The absolute base URL for the SimpleSAMLphp installation.
      * @throws \SimpleSAML\Error\CriticalConfigurationError If 'baseurlpath' has an invalid format.
      *
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
      */
     public static function getBaseURL(): string
     {
@@ -668,7 +650,6 @@ class HTTP
      *
      * @return string The first element of the URL path, with an optional, leading slash.
      *
-     * @author Andreas Solberg, UNINETT AS <andreas.solberg@uninett.no>
      */
     public static function getFirstPathElement(bool $leadingSlash = true): string
     {
@@ -688,8 +669,6 @@ class HTTP
      * @return string  A URL which can be accessed to post the data.
      * @throws \InvalidArgumentException If $destination is not a string or $data is not an array.
      *
-     * @author Andjelko Horvat
-     * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
      */
     public static function getPOSTRedirectURL(string $destination, array $data): string
     {
@@ -717,7 +696,6 @@ class HTTP
      *
      * @return string The current host.
      *
-     * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
      */
     public static function getSelfHost(): string
     {
@@ -735,8 +713,6 @@ class HTTP
      * @return string The current host, followed by a colon and the port number, in case the port is not standard for
      * the protocol.
      *
-     * @author Andreas Solberg, UNINETT AS <andreas.solberg@uninett.no>
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
      */
     public static function getSelfHostWithNonStandardPort(): string
     {
@@ -757,8 +733,6 @@ class HTTP
      *
      * @return string The current host (with non-default ports included) plus the URL path.
      *
-     * @author Andreas Solberg, UNINETT AS <andreas.solberg@uninett.no>
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
      */
     public static function getSelfHostWithPath(): string
     {
@@ -780,9 +754,6 @@ class HTTP
      *
      * @return string The current URL, including query parameters.
      *
-     * @author Andreas Solberg, UNINETT AS <andreas.solberg@uninett.no>
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
-     * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
      */
     public static function getSelfURL(): string
     {
@@ -844,8 +815,6 @@ class HTTP
      *
      * @return string The current URL without path or query parameters.
      *
-     * @author Andreas Solberg, UNINETT AS <andreas.solberg@uninett.no>
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
      */
     public static function getSelfURLHost(): string
     {
@@ -864,8 +833,6 @@ class HTTP
      *
      * @return string The current URL, not including query parameters.
      *
-     * @author Andreas Solberg, UNINETT AS <andreas.solberg@uninett.no>
-     * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
      */
     public static function getSelfURLNoQuery(): string
     {
@@ -883,8 +850,6 @@ class HTTP
      *
      * @return boolean True if the HTTPS is used, false otherwise.
      *
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
-     * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
      */
     public static function isHTTPS(): bool
     {
@@ -901,8 +866,6 @@ class HTTP
      * @return string An absolute URL for the given relative URL.
      * @throws \InvalidArgumentException If $url is not a string or a valid URL.
      *
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
-     * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
      */
     public static function normalizeURL(string $url): string
     {
@@ -930,7 +893,6 @@ class HTTP
      * @return array The query string as an associative array.
      * @throws \InvalidArgumentException If $query_string is not a string.
      *
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
      */
     public static function parseQueryString(string $query_string): array
     {
@@ -973,7 +935,6 @@ class HTTP
      * @return void This function never returns.
      * @throws \InvalidArgumentException If $url is not a string or $parameters is not an array.
      *
-     * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
      */
     public static function redirectTrustedURL(string $url, array $parameters = []): void
     {
@@ -1001,7 +962,6 @@ class HTTP
      * @return void This function never returns.
      * @throws \InvalidArgumentException If $url is not a string or $parameters is not an array.
      *
-     * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
      */
     public static function redirectUntrustedURL(string $url, array $parameters = []): void
     {
@@ -1028,8 +988,6 @@ class HTTP
      * @throws \InvalidArgumentException If the base URL cannot be parsed into a valid URL, or the given parameters
      *     are not strings.
      *
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
-     * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
      */
     public static function resolveURL(string $url, string $base = null): string
     {
@@ -1105,8 +1063,6 @@ class HTTP
      *
      * @return void
      *
-     * @author Andjelko Horvat
-     * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
      */
     public static function setCookie(string $name, ?string $value, array $params = null, bool $throw = true): void
     {
@@ -1205,9 +1161,6 @@ class HTTP
      *
      * @return void
      *
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
-     * @author Andjelko Horvat
-     * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
      */
     public static function submitPOSTData(string $destination, array $data): void
     {
diff --git a/lib/SimpleSAML/Utils/Net.php b/lib/SimpleSAML/Utils/Net.php
index 67a0bb342..99bb76242 100644
--- a/lib/SimpleSAML/Utils/Net.php
+++ b/lib/SimpleSAML/Utils/Net.php
@@ -20,10 +20,6 @@ class Net
      *
      * @return boolean True if the IP address belongs to the specified CIDR, false otherwise.
      *
-     * @author Andreas Ă…kre Solberg, UNINETT AS <andreas.solberg@uninett.no>
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
-     * @author Brook Schofield, GÉANT
-     * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
      */
     public static function ipCIDRcheck(string $cidr, string $ip = null): bool
     {
diff --git a/lib/SimpleSAML/Utils/Random.php b/lib/SimpleSAML/Utils/Random.php
index b66119ecf..4856c2e04 100644
--- a/lib/SimpleSAML/Utils/Random.php
+++ b/lib/SimpleSAML/Utils/Random.php
@@ -21,9 +21,6 @@ class Random
      *
      * @return string A ID_LENGTH-bytes long string with a random, hex-encoded string.
      *
-     * @author Andreas Solberg, UNINETT AS <andreas.solberg@uninett.no>
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
-     * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
      */
     public static function generateID(): string
     {
diff --git a/lib/SimpleSAML/Utils/System.php b/lib/SimpleSAML/Utils/System.php
index 1ac601870..8f831b817 100644
--- a/lib/SimpleSAML/Utils/System.php
+++ b/lib/SimpleSAML/Utils/System.php
@@ -31,7 +31,6 @@ class System
      * @return int|false A predefined constant identifying the OS we are running on.
      *                   False if we are unable to determine it.
      *
-     * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
      */
     public static function getOS()
     {
@@ -70,10 +69,6 @@ class System
      * @throws Error\Exception If the temporary directory cannot be created or it exists and cannot be written
      * to by the current user.
      *
-     * @author Andreas Solberg, UNINETT AS <andreas.solberg@uninett.no>
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
-     * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
-     * @author Aaron St. Clair, ECRS AS <astclair@ecrs.com>
      */
     public static function getTempDir(): string
     {
@@ -125,7 +120,6 @@ class System
      *
      * @return string An absolute path referring to $path.
      *
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
      */
     public static function resolvePath(string $path, string $base = null): string
     {
@@ -191,10 +185,6 @@ class System
      * @throws Error\Exception If the file cannot be saved, permissions cannot be changed or it is not
      *     possible to write to the target file.
      *
-     * @author Andreas Solberg, UNINETT AS <andreas.solberg@uninett.no>
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
-     * @author Andjelko Horvat
-     * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
      */
     public static function writeFile(string $filename, string $data, int $mode = 0600): void
     {
diff --git a/lib/SimpleSAML/Utils/Time.php b/lib/SimpleSAML/Utils/Time.php
index 3ecbc8534..62661b715 100644
--- a/lib/SimpleSAML/Utils/Time.php
+++ b/lib/SimpleSAML/Utils/Time.php
@@ -30,7 +30,6 @@ class Time
      * @param int $instant The time the timestamp should represent. Defaults to current time.
      *
      * @return string The timestamp.
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
      */
     public static function generateTimestamp(int $instant = null): string
     {
@@ -46,7 +45,6 @@ class Time
      *
      * This function should be called before any calls to date().
      *
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
      *
      * @return void
      * @throws \SimpleSAML\Error\Exception If the timezone set in the configuration is invalid.
diff --git a/lib/SimpleSAML/Utils/XML.php b/lib/SimpleSAML/Utils/XML.php
index c9b206a14..9c0d98c44 100644
--- a/lib/SimpleSAML/Utils/XML.php
+++ b/lib/SimpleSAML/Utils/XML.php
@@ -39,8 +39,6 @@ class XML
      *
      * @return void
      *
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
-     * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
      */
     public static function checkSAMLMessage(string $message, string $type): void
     {
@@ -96,7 +94,6 @@ class XML
      *
      * @return void
      *
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
      */
     public static function debugSAMLMessage($message, string $type): void
     {
@@ -162,7 +159,6 @@ class XML
      *
      * @return void
      *
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
      */
     public static function formatDOMElement(DOMNode $root, string $indentBase = ''): void
     {
@@ -248,7 +244,6 @@ class XML
      * @throws \InvalidArgumentException If the parameters are not strings.
      * @throws \DOMException If the input does not parse correctly as an XML string.
      *
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
      */
     public static function formatXMLString(string $xml, string $indentBase = ''): string
     {
@@ -311,7 +306,6 @@ class XML
      * @return string The text content of the element.
      * @throws \SimpleSAML\Error\Exception If the element contains a non-text child node.
      *
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
      */
     public static function getDOMText(DOMElement $element): string
     {
@@ -349,8 +343,6 @@ class XML
      * @return boolean True if both namespace and local name matches, false otherwise.
      * @throws \InvalidArgumentException If the namespace shortcut is unknown.
      *
-     * @author Andreas Solberg, UNINETT AS <andreas.solberg@uninett.no>
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
      */
     public static function isDOMNodeOfType(DOMNode $element, string $name, string $nsURI): bool
     {
@@ -400,7 +392,6 @@ class XML
      * @return bool|string Returns a string with errors found if validation fails. True if validation passes ok.
      * @throws \InvalidArgumentException If $schema is not a string, or $xml is neither a string nor a \DOMDocument.
      *
-     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
      */
     public static function isValid($xml, string $schema)
     {
diff --git a/lib/SimpleSAML/XHTML/IdPDisco.php b/lib/SimpleSAML/XHTML/IdPDisco.php
index 19417c8ab..408855334 100644
--- a/lib/SimpleSAML/XHTML/IdPDisco.php
+++ b/lib/SimpleSAML/XHTML/IdPDisco.php
@@ -18,9 +18,6 @@ use SimpleSAML\Utils;
  * Experimental support added for Extended IdP Metadata Discovery Protocol by Andreas 2008-08-28
  * More information: https://docs.oasis-open.org/security/saml/Post2.0/sstc-saml-idp-discovery.pdf
  *
- * @author Jaime Pérez <jaime.perez@uninett.no>, UNINETT AS.
- * @author Olav Morken, UNINETT AS.
- * @author Andreas Ă…kre Solberg <andreas@uninett.no>, UNINETT AS.
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/XHTML/Template.php b/lib/SimpleSAML/XHTML/Template.php
index 87c8f63e6..b6873c991 100644
--- a/lib/SimpleSAML/XHTML/Template.php
+++ b/lib/SimpleSAML/XHTML/Template.php
@@ -3,7 +3,6 @@
 /**
  * A minimalistic XHTML PHP based template system implemented for SimpleSAMLphp.
  *
- * @author Andreas Ă…kre Solberg, UNINETT AS. <andreas.solberg@uninett.no>
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/XML/Errors.php b/lib/SimpleSAML/XML/Errors.php
index c4bf02ec9..b6363278e 100644
--- a/lib/SimpleSAML/XML/Errors.php
+++ b/lib/SimpleSAML/XML/Errors.php
@@ -6,7 +6,6 @@
  * In PHP versions which doesn't support accessing error information, this class
  * will hide that, and pretend that no errors were logged.
  *
- * @author Olav Morken, UNINETT AS.
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/XML/Parser.php b/lib/SimpleSAML/XML/Parser.php
index ea601d8b8..07f506e17 100644
--- a/lib/SimpleSAML/XML/Parser.php
+++ b/lib/SimpleSAML/XML/Parser.php
@@ -3,7 +3,6 @@
 /**
  * This file will help doing XPath queries in SAML 2 XML documents.
  *
- * @author Andreas Ă…kre Solberg, UNINETT AS. <andreas.solberg@uninett.no>
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/XML/Signer.php b/lib/SimpleSAML/XML/Signer.php
index cd08ae2c1..cbb99c18c 100644
--- a/lib/SimpleSAML/XML/Signer.php
+++ b/lib/SimpleSAML/XML/Signer.php
@@ -5,7 +5,6 @@
  *
  * This is a helper class for signing XML documents.
  *
- * @author Olav Morken, UNINETT AS.
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/SimpleSAML/XML/Validator.php b/lib/SimpleSAML/XML/Validator.php
index 793df2b52..e09332bdb 100644
--- a/lib/SimpleSAML/XML/Validator.php
+++ b/lib/SimpleSAML/XML/Validator.php
@@ -3,7 +3,6 @@
 /**
  * This class implements helper functions for XML validation.
  *
- * @author Olav Morken, UNINETT AS.
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/_autoload.php b/lib/_autoload.php
index 99773aae2..4eabbc022 100644
--- a/lib/_autoload.php
+++ b/lib/_autoload.php
@@ -4,7 +4,6 @@
  * This file is a backwards compatible autoloader for SimpleSAMLphp.
  * Loads the Composer autoloader.
  *
- * @author Olav Morken, UNINETT AS.
  * @package SimpleSAMLphp
  */
 
diff --git a/lib/_autoload_modules.php b/lib/_autoload_modules.php
index 105843a8d..5d98c4dda 100644
--- a/lib/_autoload_modules.php
+++ b/lib/_autoload_modules.php
@@ -5,8 +5,6 @@ declare(strict_types=1);
 /**
  * This file registers an autoloader for SimpleSAMLphp modules.
  *
- * @author Boy Baukema, SURFnet
- * @author Jaime Perez <jaime.perez@uninett.no>, UNINETT
  * @package SimpleSAMLphp
  */
 
diff --git a/modules/core/lib/Auth/Process/AttributeAdd.php b/modules/core/lib/Auth/Process/AttributeAdd.php
index 5a1ff5e99..14493b090 100644
--- a/modules/core/lib/Auth/Process/AttributeAdd.php
+++ b/modules/core/lib/Auth/Process/AttributeAdd.php
@@ -13,7 +13,6 @@ use SimpleSAML\Auth;
  *
  * This filter allows you to add attributes to the attribute set being processed.
  *
- * @author Olav Morken, UNINETT AS.
  * @package SimpleSAMLphp
  */
 class AttributeAdd extends Auth\ProcessingFilter
diff --git a/modules/core/lib/Auth/Process/AttributeAlter.php b/modules/core/lib/Auth/Process/AttributeAlter.php
index 0f4f6d3ef..e6a4be7b0 100644
--- a/modules/core/lib/Auth/Process/AttributeAlter.php
+++ b/modules/core/lib/Auth/Process/AttributeAlter.php
@@ -13,7 +13,6 @@ use SimpleSAML\Error;
  *
  * This filter can modify or replace attributes given a regular expression.
  *
- * @author Jacob Christiansen, WAYF
  * @package SimpleSAMLphp
  */
 class AttributeAlter extends Auth\ProcessingFilter
diff --git a/modules/core/lib/Auth/Process/AttributeCopy.php b/modules/core/lib/Auth/Process/AttributeCopy.php
index 8fd600129..f5631bb5e 100644
--- a/modules/core/lib/Auth/Process/AttributeCopy.php
+++ b/modules/core/lib/Auth/Process/AttributeCopy.php
@@ -11,7 +11,6 @@ use SimpleSAML\Auth;
 /**
  * Attribute filter for renaming attributes.
  *
- * @author Gyula Szabo MTA SZTAKI
  * @package SimpleSAMLphp
  *
  * You just follow the 'source' => 'destination' schema. In this example user's  * cn will be the user's displayName.
diff --git a/modules/core/lib/Auth/Process/AttributeLimit.php b/modules/core/lib/Auth/Process/AttributeLimit.php
index e61301cd8..91f6757b5 100644
--- a/modules/core/lib/Auth/Process/AttributeLimit.php
+++ b/modules/core/lib/Auth/Process/AttributeLimit.php
@@ -12,7 +12,6 @@ use SimpleSAML\Logger;
 /**
  * A filter for limiting which attributes are passed on.
  *
- * @author Olav Morken, UNINETT AS.
  * @package SimpleSAMLphp
  */
 class AttributeLimit extends Auth\ProcessingFilter
diff --git a/modules/core/lib/Auth/Process/AttributeMap.php b/modules/core/lib/Auth/Process/AttributeMap.php
index 8fcecb20d..7dcfbc638 100644
--- a/modules/core/lib/Auth/Process/AttributeMap.php
+++ b/modules/core/lib/Auth/Process/AttributeMap.php
@@ -13,7 +13,6 @@ use SimpleSAML\Module;
 /**
  * Attribute filter for renaming attributes.
  *
- * @author Olav Morken, UNINETT AS.
  * @package SimpleSAMLphp
  */
 class AttributeMap extends Auth\ProcessingFilter
diff --git a/modules/core/lib/Auth/Process/AttributeValueMap.php b/modules/core/lib/Auth/Process/AttributeValueMap.php
index 183b48546..14d3b0b6b 100644
--- a/modules/core/lib/Auth/Process/AttributeValueMap.php
+++ b/modules/core/lib/Auth/Process/AttributeValueMap.php
@@ -12,7 +12,6 @@ use SimpleSAML\Logger;
 /**
  * Filter to create target attribute based on value(s) in source attribute
  *
- * @author Martin van Es, m7
  * @package SimpleSAMLphp
  */
 class AttributeValueMap extends Auth\ProcessingFilter
diff --git a/modules/core/lib/Auth/Process/Cardinality.php b/modules/core/lib/Auth/Process/Cardinality.php
index 9e3bb200c..275799628 100644
--- a/modules/core/lib/Auth/Process/Cardinality.php
+++ b/modules/core/lib/Auth/Process/Cardinality.php
@@ -14,7 +14,6 @@ use SimpleSAML\Utils;
 /**
  * Filter to ensure correct cardinality of attributes
  *
- * @author Guy Halse, http://orcid.org/0000-0002-9388-8592
  * @package SimpleSAMLphp
  */
 class Cardinality extends Auth\ProcessingFilter
diff --git a/modules/core/lib/Auth/Process/CardinalitySingle.php b/modules/core/lib/Auth/Process/CardinalitySingle.php
index 23ddc4e54..c1c667f24 100644
--- a/modules/core/lib/Auth/Process/CardinalitySingle.php
+++ b/modules/core/lib/Auth/Process/CardinalitySingle.php
@@ -16,7 +16,6 @@ use SimpleSAML\Utils;
  * This filter implements a special case of the core:Cardinality filter, and
  * allows for optional corrections to be made when cardinality errors are encountered.
  *
- * @author Guy Halse, http://orcid.org/0000-0002-9388-8592
  * @package SimpleSAMLphp
  */
 class CardinalitySingle extends Auth\ProcessingFilter
diff --git a/modules/core/lib/Auth/Process/GenerateGroups.php b/modules/core/lib/Auth/Process/GenerateGroups.php
index d5bb34529..c0d0ceef8 100644
--- a/modules/core/lib/Auth/Process/GenerateGroups.php
+++ b/modules/core/lib/Auth/Process/GenerateGroups.php
@@ -12,7 +12,6 @@ use SimpleSAML\Logger;
 /**
  * Filter to generate a groups attribute based on many of the attributes of the user.
  *
- * @author Olav Morken, UNINETT AS.
  * @package SimpleSAMLphp
  */
 class GenerateGroups extends Auth\ProcessingFilter
diff --git a/modules/core/lib/Auth/Process/LanguageAdaptor.php b/modules/core/lib/Auth/Process/LanguageAdaptor.php
index 3c1be618b..11dd96d3b 100644
--- a/modules/core/lib/Auth/Process/LanguageAdaptor.php
+++ b/modules/core/lib/Auth/Process/LanguageAdaptor.php
@@ -12,7 +12,6 @@ use SimpleSAML\Logger;
 /**
  * Filter to set and get language settings from attributes.
  *
- * @author Andreas Ă…kre Solberg, UNINETT AS.
  * @package SimpleSAMLphp
  */
 class LanguageAdaptor extends Auth\ProcessingFilter
diff --git a/modules/core/lib/Auth/Process/StatisticsWithAttribute.php b/modules/core/lib/Auth/Process/StatisticsWithAttribute.php
index 8b2774b00..364240254 100644
--- a/modules/core/lib/Auth/Process/StatisticsWithAttribute.php
+++ b/modules/core/lib/Auth/Process/StatisticsWithAttribute.php
@@ -12,7 +12,6 @@ use SimpleSAML\Logger;
 /**
  * Log a line in the STAT log with one attribute.
  *
- * @author Andreas Ă…kre Solberg, UNINETT AS.
  * @package SimpleSAMLphp
  */
 class StatisticsWithAttribute extends Auth\ProcessingFilter
diff --git a/modules/core/lib/Auth/Process/TargetedID.php b/modules/core/lib/Auth/Process/TargetedID.php
index ec2c2cc75..4fe2f3d78 100644
--- a/modules/core/lib/Auth/Process/TargetedID.php
+++ b/modules/core/lib/Auth/Process/TargetedID.php
@@ -28,7 +28,6 @@ use SimpleSAML\Utils;
  * ]
  * </code>
  *
- * @author Olav Morken, UNINETT AS.
  * @package SimpleSAMLphp
  */
 class TargetedID extends Auth\ProcessingFilter
diff --git a/modules/core/lib/Auth/UserPassBase.php b/modules/core/lib/Auth/UserPassBase.php
index c81c172e9..3d69ef738 100644
--- a/modules/core/lib/Auth/UserPassBase.php
+++ b/modules/core/lib/Auth/UserPassBase.php
@@ -19,7 +19,6 @@ use SimpleSAML\Utils\HTTP;
  * This helper class allows for implementations of username/password authentication by
  * implementing a single function: login($username, $password)
  *
- * @author Olav Morken, UNINETT AS.
  * @package SimpleSAMLphp
  */
 abstract class UserPassBase extends Auth\Source
diff --git a/modules/core/lib/Auth/UserPassOrgBase.php b/modules/core/lib/Auth/UserPassOrgBase.php
index a1186cae7..ce9ead3c5 100644
--- a/modules/core/lib/Auth/UserPassOrgBase.php
+++ b/modules/core/lib/Auth/UserPassOrgBase.php
@@ -19,7 +19,6 @@ use SimpleSAML\Utils;
  * - login($username, $password, $organization)
  * - getOrganizations()
  *
- * @author Olav Morken, UNINETT AS.
  * @package SimpleSAMLphp
  */
 abstract class UserPassOrgBase extends Auth\Source
diff --git a/modules/core/lib/Storage/SQLPermanentStorage.php b/modules/core/lib/Storage/SQLPermanentStorage.php
index dda3fa35c..f25519539 100644
--- a/modules/core/lib/Storage/SQLPermanentStorage.php
+++ b/modules/core/lib/Storage/SQLPermanentStorage.php
@@ -13,7 +13,6 @@ use SimpleSAML\Configuration;
  * Generic SQL Store to store key value pairs. To be used in several other modules that needs
  * to store data permanently.
  *
- * @author Andreas Ă…kre Solberg <andreas@uninett.no>, UNINETT AS.
  * @package SimpleSAMLphp
  */
 
diff --git a/modules/core/www/loginuserpass.php b/modules/core/www/loginuserpass.php
index ec9faec0a..bb5d59c24 100644
--- a/modules/core/www/loginuserpass.php
+++ b/modules/core/www/loginuserpass.php
@@ -5,7 +5,6 @@
  * to the \SimpleSAML\Module\core\Auth\UserPassBase class, which is a generic class for
  * username/password authentication.
  *
- * @author Olav Morken, UNINETT AS.
  * @package SimpleSAMLphp
  */
 
diff --git a/modules/core/www/loginuserpassorg.php b/modules/core/www/loginuserpassorg.php
index 2130fd4ac..636fd969c 100644
--- a/modules/core/www/loginuserpassorg.php
+++ b/modules/core/www/loginuserpassorg.php
@@ -5,7 +5,6 @@
  * into the \SimpleSAML\Module\core\Auth\UserPassBase class, which is a generic class for
  * username/password/organization authentication.
  *
- * @author Olav Morken, UNINETT AS.
  * @package SimpleSAMLphp
  */
 
diff --git a/modules/exampleauth/lib/Auth/Source/StaticSource.php b/modules/exampleauth/lib/Auth/Source/StaticSource.php
index ead4484ba..fc8716305 100644
--- a/modules/exampleauth/lib/Auth/Source/StaticSource.php
+++ b/modules/exampleauth/lib/Auth/Source/StaticSource.php
@@ -15,7 +15,6 @@ use SimpleSAML\Utils;
  * This class is an example authentication source which will always return a user with
  * a static set of attributes.
  *
- * @author Olav Morken, UNINETT AS.
  * @package SimpleSAMLphp
  */
 class StaticSource extends Auth\Source
diff --git a/modules/exampleauth/lib/Auth/Source/UserPass.php b/modules/exampleauth/lib/Auth/Source/UserPass.php
index 62fa2ee09..a7a19adee 100644
--- a/modules/exampleauth/lib/Auth/Source/UserPass.php
+++ b/modules/exampleauth/lib/Auth/Source/UserPass.php
@@ -16,7 +16,6 @@ use SimpleSAML\Utils;
  * This class is an example authentication source which stores all username/passwords in an array,
  * and authenticates users against this array.
  *
- * @author Olav Morken, UNINETT AS.
  * @package SimpleSAMLphp
  */
 
diff --git a/modules/exampleauth/www/redirecttest.php b/modules/exampleauth/www/redirecttest.php
index ff06102cd..373c8527f 100644
--- a/modules/exampleauth/www/redirecttest.php
+++ b/modules/exampleauth/www/redirecttest.php
@@ -3,7 +3,6 @@
 /**
  * Request handler for redirect filter test.
  *
- * @author Olav Morken, UNINETT AS.
  * @package SimpleSAMLphp
  */
 
diff --git a/modules/multiauth/lib/Auth/Source/MultiAuth.php b/modules/multiauth/lib/Auth/Source/MultiAuth.php
index 7e6cb6fb2..adb283032 100644
--- a/modules/multiauth/lib/Auth/Source/MultiAuth.php
+++ b/modules/multiauth/lib/Auth/Source/MultiAuth.php
@@ -17,7 +17,6 @@ use SimpleSAML\Utils;
  * Authentication source which let the user chooses among a list of
  * other authentication sources
  *
- * @author Lorenzo Gil, Yaco Sistemas S.L.
  * @package SimpleSAMLphp
  */
 class MultiAuth extends Auth\Source
diff --git a/modules/multiauth/www/selectsource.php b/modules/multiauth/www/selectsource.php
index f635521b6..fcc5a9672 100644
--- a/modules/multiauth/www/selectsource.php
+++ b/modules/multiauth/www/selectsource.php
@@ -6,7 +6,6 @@
  * \SimpleSAML\Module\multiauth\Auth\Source\MultiAuth class and call the
  * delegateAuthentication method on it.
  *
- * @author Lorenzo Gil, Yaco Sistemas S.L.
  * @package SimpleSAMLphp
  */
 
diff --git a/modules/saml/lib/Auth/Process/FilterScopes.php b/modules/saml/lib/Auth/Process/FilterScopes.php
index 0e374d07a..5b58f9307 100644
--- a/modules/saml/lib/Auth/Process/FilterScopes.php
+++ b/modules/saml/lib/Auth/Process/FilterScopes.php
@@ -12,8 +12,6 @@ use SimpleSAML\Utils;
 /**
  * Filter to remove attribute values which are not properly scoped.
  *
- * @author Adam Lantos, NIIF / Hungarnet
- * @author Jaime Pérez Crespo, UNINETT AS <jaime.perez@uninett.no>
  * @package SimpleSAMLphp
  */
 
diff --git a/modules/saml/lib/Error/NoAuthnContext.php b/modules/saml/lib/Error/NoAuthnContext.php
index 100951540..d3c59fc46 100644
--- a/modules/saml/lib/Error/NoAuthnContext.php
+++ b/modules/saml/lib/Error/NoAuthnContext.php
@@ -10,7 +10,6 @@ use Throwable;
 /**
  * A SAML error indicating that none of the requested Authentication Contexts can be used.
  *
- * @author Jaime Pérez Crespo, UNINETT AS <jaime.perez@uninett.no>
  * @package SimpleSAMLphp
  */
 class NoAuthnContext extends \SimpleSAML\Module\saml\Error
diff --git a/modules/saml/lib/Error/NoAvailableIDP.php b/modules/saml/lib/Error/NoAvailableIDP.php
index 5b6900092..8bf501468 100644
--- a/modules/saml/lib/Error/NoAvailableIDP.php
+++ b/modules/saml/lib/Error/NoAvailableIDP.php
@@ -10,7 +10,6 @@ use Throwable;
 /**
  * A SAML error indicating that none of the requested IdPs can be used.
  *
- * @author Jaime Pérez Crespo, UNINETT AS <jaime.perez@uninett.no>
  * @package SimpleSAMLphp
  */
 class NoAvailableIDP extends \SimpleSAML\Module\saml\Error
diff --git a/modules/saml/lib/Error/NoPassive.php b/modules/saml/lib/Error/NoPassive.php
index f6e8f7251..eb99a140b 100644
--- a/modules/saml/lib/Error/NoPassive.php
+++ b/modules/saml/lib/Error/NoPassive.php
@@ -10,7 +10,6 @@ use Throwable;
 /**
  * A SAML error indicating that passive authentication cannot be used.
  *
- * @author Jaime Pérez Crespo, UNINETT AS <jaime.perez@uninett.no>
  * @package SimpleSAMLphp
  */
 class NoPassive extends \SimpleSAML\Module\saml\Error
diff --git a/modules/saml/lib/Error/NoSupportedIDP.php b/modules/saml/lib/Error/NoSupportedIDP.php
index 13fa5c391..8afee7561 100644
--- a/modules/saml/lib/Error/NoSupportedIDP.php
+++ b/modules/saml/lib/Error/NoSupportedIDP.php
@@ -10,7 +10,6 @@ use Throwable;
 /**
  * A SAML error indicating that none of the IdPs requested are supported.
  *
- * @author Jaime Pérez Crespo, UNINETT AS <jaime.perez@uninett.no>
  * @package SimpleSAMLphp
  */
 class NoSupportedIDP extends \SimpleSAML\Module\saml\Error
diff --git a/modules/saml/lib/Error/ProxyCountExceeded.php b/modules/saml/lib/Error/ProxyCountExceeded.php
index e078c803b..4a7a5d9b6 100644
--- a/modules/saml/lib/Error/ProxyCountExceeded.php
+++ b/modules/saml/lib/Error/ProxyCountExceeded.php
@@ -10,7 +10,6 @@ use Throwable;
 /**
  * A SAML error indicating that the maximum amount of proxies traversed has been reached.
  *
- * @author Jaime Pérez Crespo, UNINETT AS <jaime.perez@uninett.no>
  * @package SimpleSAMLphp
  */
 class ProxyCountExceeded extends \SimpleSAML\Module\saml\Error
diff --git a/modules/saml/www/proxy/invalid_session.php b/modules/saml/www/proxy/invalid_session.php
index ef0885887..30c18095d 100644
--- a/modules/saml/www/proxy/invalid_session.php
+++ b/modules/saml/www/proxy/invalid_session.php
@@ -4,7 +4,6 @@
  * This file will handle the case of a user with an existing session that's not valid for a specific Service Provider,
  * since the authenticating IdP is not in the list of IdPs allowed by the SP.
  *
- * @author Jaime Pérez Crespo, UNINETT AS <jaime.perez@uninett.no>
  *
  * @package SimpleSAMLphp
  */
diff --git a/tests/lib/SimpleSAML/DatabaseTest.php b/tests/lib/SimpleSAML/DatabaseTest.php
index c1251608e..bcda35d06 100644
--- a/tests/lib/SimpleSAML/DatabaseTest.php
+++ b/tests/lib/SimpleSAML/DatabaseTest.php
@@ -23,7 +23,6 @@ use SimpleSAML\Database;
  *
  * @covers \SimpleSAML\Database
  *
- * @author Tyler Antonio, University of Alberta. <tantonio@ualberta.ca>
  * @package SimpleSAMLphp
  */
 class DatabaseTest extends TestCase
diff --git a/tests/lib/SimpleSAML/Store/SQLTest.php b/tests/lib/SimpleSAML/Store/SQLTest.php
index 93fcb5368..0d335ebe4 100644
--- a/tests/lib/SimpleSAML/Store/SQLTest.php
+++ b/tests/lib/SimpleSAML/Store/SQLTest.php
@@ -17,7 +17,6 @@ use SimpleSAML\Store;
  *
  * @covers \SimpleSAML\Store\SQL
  *
- * @author Sergio GĂłmez <sergio@uco.es>
  * @package simplesamlphp/simplesamlphp
  */
 class SQLTest extends TestCase
diff --git a/tests/lib/SimpleSAML/StoreTest.php b/tests/lib/SimpleSAML/StoreTest.php
index e04bc23d7..582ef8d6e 100644
--- a/tests/lib/SimpleSAML/StoreTest.php
+++ b/tests/lib/SimpleSAML/StoreTest.php
@@ -18,7 +18,6 @@ use SimpleSAML\Store;
  *
  * @covers \SimpleSAML\Store
  *
- * @author Sergio GĂłmez <sergio@uco.es>
  * @package simplesamlphp/simplesamlphp
  */
 class StoreTest extends TestCase
diff --git a/tests/lib/SimpleSAML/Utils/AttributesTest.php b/tests/lib/SimpleSAML/Utils/AttributesTest.php
index 63b4f5b7e..85ccca10a 100644
--- a/tests/lib/SimpleSAML/Utils/AttributesTest.php
+++ b/tests/lib/SimpleSAML/Utils/AttributesTest.php
@@ -13,7 +13,6 @@ use SimpleSAML\Utils\Attributes;
  * Tests for SimpleSAML\Utils\Attributes.
  *
  * @covers \SimpleSAML\Utils\Attributes
- * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
  */
 class AttributesTest extends TestCase
 {
diff --git a/tests/lib/SimpleSAML/XML/ErrorsTest.php b/tests/lib/SimpleSAML/XML/ErrorsTest.php
index 2a6c2e8c7..ad9a9ab94 100644
--- a/tests/lib/SimpleSAML/XML/ErrorsTest.php
+++ b/tests/lib/SimpleSAML/XML/ErrorsTest.php
@@ -16,7 +16,6 @@ use SimpleSAML\XML\Errors;
  *
  * @covers \SimpleSAML\XML\Errors
  *
- * @author Sergio GĂłmez <sergio@uco.es>
  * @package simplesamlphp/simplesamlphp
  */
 class ErrorsTest extends TestCase
diff --git a/tests/modules/saml/lib/Auth/Process/FilterScopesTest.php b/tests/modules/saml/lib/Auth/Process/FilterScopesTest.php
index 9b5296fbe..de82c8adb 100644
--- a/tests/modules/saml/lib/Auth/Process/FilterScopesTest.php
+++ b/tests/modules/saml/lib/Auth/Process/FilterScopesTest.php
@@ -12,7 +12,6 @@ use SimpleSAML\Module\saml\Auth\Process\FilterScopes;
  *
  * @covers \SimpleSAML\Module\saml\Auth\Process\FilterScopes
  *
- * @author Jaime Pérez Crespo, UNINETT AS <jaime.perez@uninett.no>
  * @package SimpleSAMLphp
  */
 class FilterScopesTest extends TestCase
diff --git a/tests/modules/saml/lib/Auth/Process/NameIDAttributeTest.php b/tests/modules/saml/lib/Auth/Process/NameIDAttributeTest.php
index 4649f3836..664071df7 100644
--- a/tests/modules/saml/lib/Auth/Process/NameIDAttributeTest.php
+++ b/tests/modules/saml/lib/Auth/Process/NameIDAttributeTest.php
@@ -15,7 +15,6 @@ use SAML2\Constants;
  *
  * @covers \SimpleSAML\Module\saml\Auth\Process\NameIDAttribute
  *
- * @author Eugene Venter <eugene@catalyst.net.nz>
  * @package SimpleSAMLphp
  */
 class NameIDAttributeTest extends TestCase
diff --git a/tests/modules/saml/lib/IdP/SQLNameIDTest.php b/tests/modules/saml/lib/IdP/SQLNameIDTest.php
index 181b2d64b..2a5ae7b40 100644
--- a/tests/modules/saml/lib/IdP/SQLNameIDTest.php
+++ b/tests/modules/saml/lib/IdP/SQLNameIDTest.php
@@ -16,7 +16,6 @@ use SimpleSAML\Store;
  *
  * @covers \SimpleSAML\Module\saml\IdP\SQLNameID
  *
- * @author Pavel Brousek <brousek@ics.muni.cz>
  * @package SimpleSAMLphp
  */
 class SQLNameIDTest extends TestCase
diff --git a/tests/www/IndexTest.php b/tests/www/IndexTest.php
index 1985d8388..070689829 100644
--- a/tests/www/IndexTest.php
+++ b/tests/www/IndexTest.php
@@ -12,7 +12,6 @@ use SimpleSAML\TestUtils\BuiltInServer;
  *
  * This test is intended mostly as a demonstration of how to test the public web interface in SimpleSAMLphp.
  *
- * @author Jaime Pérez Crespo <jaime.perez@uninett.no>
  * @package SimpleSAMLphp
  */
 class IndexTest extends TestCase
diff --git a/www/saml2/idp/ArtifactResolutionService.php b/www/saml2/idp/ArtifactResolutionService.php
index 12ebdb152..bcec37713 100644
--- a/www/saml2/idp/ArtifactResolutionService.php
+++ b/www/saml2/idp/ArtifactResolutionService.php
@@ -4,7 +4,6 @@
  * The ArtifactResolutionService receives the samlart from the sp.
  * And when the artifact is found, it sends a \SAML2\ArtifactResponse.
  *
- * @author Danny Bollaert, UGent AS. <danny.bollaert@ugent.be>
  * @package SimpleSAMLphp
  */
 
diff --git a/www/saml2/idp/SingleLogoutService.php b/www/saml2/idp/SingleLogoutService.php
index f4bb144ff..ab41bab98 100644
--- a/www/saml2/idp/SingleLogoutService.php
+++ b/www/saml2/idp/SingleLogoutService.php
@@ -4,7 +4,6 @@
  * This SAML 2.0 endpoint can receive incoming LogoutRequests. It will also send LogoutResponses,
  * and LogoutRequests and also receive LogoutResponses. It is implemeting SLO at the SAML 2.0 IdP.
  *
- * @author Andreas Ă…kre Solberg, UNINETT AS. <andreas.solberg@uninett.no>
  * @package SimpleSAMLphp
  */
 
-- 
GitLab