diff --git a/lib/SimpleSAML/Auth/ProcessingChain.php b/lib/SimpleSAML/Auth/ProcessingChain.php
index a19b4878e0ee7541359cf2cf614e5f60f630afa3..a013b0efa31bd1952b1df908b4a5d36ae1c4ae70 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 038900e5e7b9e30af9375d41354c9055120c44c1..548ae0ab88b1c0010137ce335431990b7b949c2e 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 691d1fcbe92cfeffb6a39268a1b055c93fc3556c..c415484931af505be872da2d96805bd35213b5b1 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 accfc8285ce81e8b4dd1a7c7e02c5cadb0a86e57..03d36efa4e25652789976677954ccc914ab41676 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 73b52aebcffe0fa2915c86696ad6d2776ba9d86b..9a908c0c689185ec28b383c14a83bac7e6c600c9 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 1823e80bd818f34344a578b146085308ba4095ad..8a076654dae269a2256a0305c1c51bdec0d5bed5 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 ff957ddd6b94347aee6a4f53686c6e6d9321891c..42cf63563f5674276135147c3b0f31ad86eb97c3 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 0f50939bf5a6f04ba961c42d906d72fd316215da..ed491bd0eccfbdccc0128b5ed1746ce731302525 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 427bf85a951fcb271f73f5d01f1c9d5006fa99d2..e104c12178e79d8115d836104edefe1fb798c71b 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 3c4faa810bc19b9a3e91b986e378e5d09dd562b3..48a20799503057944165ca5893c3912f58a01738 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 66032f46b3432a405d861e94562921ab45adf786..4fdcdded368a5177f56601c7fb52bc63633320f2 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 dd02e8cbd9452bf202f60e652f15aadf35bc9a72..14907a5aba43199ff2d425dd202a09d269b48bfe 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 a54075dd87573d4e3629644c27a7d365accc4150..f5285716c44131cb27a8b8ec746cc87ce4863410 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 049aeaddd10dbd655e79b28bd4ce493a35b416c3..f581cef8fd1066565b4dfbf4c4ea92c3943d2c11 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 4b853e89caff2abb314f1df7d149f24c72d30269..ce1cae1d6e8112e405bc8f4b74777a91dc61b759 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 35b991ef00c7e548e61c8e04d2c4adbf21186783..ffb57048c9b1b4fe31cb9077595330e6b4a3b52a 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 02b65ac325c24c53db73eb263f350dbb52df3d94..af96fc5f677a8f9bb5fd5adb4c2879815b17a46d 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 4f90141b41f1c9026655cb21e6e3d0d1d1987e37..99823d51d33cb6852d16f422b350e79c0d8a04f0 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 a381beed271a5bc00873f7c8f19fa9948fb53580..c1085be1a52e112dc654271415ba544a953883a1 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 ac9ae56fc6b3ade533eeab279a64dc4435aea1de..04280d9ad28461ad6c1f3b12024fedb538e45af5 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 ef76a1f4fb0143c4cddd0631ca99bda3074b9c39..776b10ddcb476e33ee2eaa39291e9686eeba6236 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 8b5bb09bdf626722b75033400ede2fcd15dc30b3..0413fd0973cdb658b2737587c40a6acd668b855b 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 10f237837cc768fb4db8b1f5b2d7c108762d33bb..9d0a82fb97a3a55063a1ae6ab3cec24003a9d932 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 4806dab9bae6f21e894063cf2ab26cf6484c63a8..fe5d4baffae7f0c096b8fd2a790d9827604aef84 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 9f912b1a8ddc322d74a8815204f59825668a17f5..a7bbe37cb4879276e83bc8aa5bebd6b7269bbb11 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 7dbb7789b03ed2c6ef7282a2d4a7edcedbe8a1eb..8874c2939d591cb557c0750ea0811c5b77d406e4 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 02b31eab87694d81acd4eae14d1dffba423b176b..c6860a2a22d51f7ca0539c21633b7c02fe4e82cc 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 bba5e48e7fa65e8d3d627ec2d07efba335cd9cd6..efa7ed232a6d8f20c9c632f4604575ce2e236c54 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 adb3ab0ed01d3b22dedd525fdef3af01318cc284..f69e4d83b9b16e94bf11c5e5b679d4983dd2b696 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 6310a62eb06fc52cad087d9fcad346fc73fb9141..d4f86e55119293a23b7b5150acf11901ab9f5549 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 ed0a4e2671a2f10b7927d8dde6f9aa64ceeef752..f40fa54002b529ea467ed318c83604e1066c6a50 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 c4707f4b5c1fc06ea09780e06a470f345159e48f..8ce1a288ba7a3cd1cf0dba7e24e6dae2a3e9899d 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 7edbdcbd1906d01aadc9c2451a6a8bed823fedbb..bf7a425bcde2771a74698ba33edfbb102c0d7027 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 ca358c124389751c945aeb2593808740fedc834d..7d5d6a0a8cd9714939d3772a210dfc959afcd674 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 98430d5e0a93aacb03d8c0250d113f0393111d83..923cca2a9ddf6eeb3a3612fe112ed52f316e7253 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 0851b23ce11f4025a10978b764363a0074045acd..6f1591296f38acbee12ee1c89dc4a42e7102615b 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 78ada32740a805103835b22b386bfc51089771a2..3d49f0faa3062328bc81d56eb700f82c28717d26 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 7fcf4b95e9946fdb7cecfc305768b842739b32e1..1ec01461b3c5f8e9e9961048bb4430b2b0b92a2a 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 7384544c6cd1086ddbd5c03ab14c3b6243d3c8d0..30a5880e23db09a0036481bc97abe20e5e50e054 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 8a960bfab7633150e0f486be27179f0cf93318de..5a8146bbdda7d1a229c6bf231edef98f62740eae 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 0f9bd90ad277607700adff552de193aff63cd35e..b667a7fe4d596dce1d4cf7225166e42f6fde015a 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 837a7e1d806c31e07f37368572f9b44e361eb4d2..047efd52235d230e145f186c0fd5fe3ded070894 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 285b87ec35720cb126093dfb898144164bb9e3ab..6461511a462d9c29d6b197f29fd9ccbfdcbec2cb 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 4d7baf293af6f569838aecc957baf96437ec798f..6e4c029f6e757adf3e90a39dd4d77013e5f188dd 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 8bfc5471e4ee60f7b2948182c30221af9bda15cc..e4c66ee218a0590dc8d70dbe3957f4987e88dbb9 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 c8089aab53959d312e706d4f91850dc6feec7a58..79d7f814931cde7082ab2d0308a2cd9656034909 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 b3cc4663177bb15b1853f2d6d2f7c572cda0f7d2..9d435c7fe950f4c3963960abab9dfc1ca8b78eb5 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 033693bb816e1279047ae7ecd9415d7912cbebfb..c1714ad9d23e1aee11b65423e7d2d5faacec63b6 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 67a0bb34239eee12996bf1251ed753a9b12614b2..99bb762428bca333b85ec65e1e5616d6998871cd 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 b66119ecfb0ff5a8db9aa83e2ce3b33927735b3a..4856c2e04867ae9f89ecb06ba052810918481bf6 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 1ac6018709b92648eca92a0d5884fa4e3574f79b..8f831b8179d1c09b6b5f4737c5870d55479034e3 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 3ecbc853452a728a56f826a602f86b136ab2b058..62661b7155e31104b2c8489db6591c385ae55fb0 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 c9b206a141c1b3d7ad6441397fc61d34050cdad7..9c0d98c44c021598e4a0f9683518cd84236b86c0 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 19417c8abed6b4d17682188c2bb34e7ce62b3ab6..408855334d82baf3d28efdf93495b5977525a555 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 87c8f63e69684ca2760f753ff5496cccbb5161e3..b6873c991c61828cdbc0893c349c06699572640b 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 c4bf02ec99be855b7e357f8ac4f47e9627924a96..b6363278eb24e8dbd766a915b6f1f3704f3aa759 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 ea601d8b874a010a040c2179e89c565e55dd9746..07f506e172ae28b10f6f12169c29dbc2d3cbb9f1 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 cd08ae2c1d8666d86b51e72fffd068b3d030c426..cbb99c18c1624837ec740968e3d9bca7dab341ad 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 793df2b52add216efcfc4bd4a5dc89213f6886b4..e09332bdb1648da89d10236766a342687b3072fd 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 99773aae25ff4f896f32cadfd0ebe080f30cb2cd..4eabbc022ec4c73829dcd7a408e0bc02687e2fb0 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 105843a8d4b31d8bd80ea5a9779425846e70cbee..5d98c4ddac73c22e3596a94c52e9589b4f803c8b 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 5a1ff5e993547be9582c67de53d253bb239b15f9..14493b090bef161a42d13b203b5c6830098dcbfa 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 0f4f6d3ef8a58885c4e45744ea1463e2ac40a644..e6a4be7b0a57260c1752f9455d0bd24864dee117 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 8fd600129d6c4a83380214ae4fae619f302ad303..f5631bb5e4b5eaff533ca36d4cedc61a8cba8b51 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 e61301cd88074a3e434be2c8685aa5f9689ee3b1..91f6757b5fd102f7083f3dae3e6fc208dd7d18d5 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 8fcecb20d42e033a6890ca042bc76ee70d41a8b3..7dcfbc63865871f665d76eb5403fda9c502b2970 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 183b48546569900bc53647aabf76d512ef5e517e..14d3b0b6b30b75c24b841034add84a7d5cf9a26a 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 9e3bb200c824f9fe6f2f30fae992a783fae60e2b..275799628978ac3202180f35c86aef8e27b4d228 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 23ddc4e540412cf0d90afa96310bb4b091f6132e..c1c667f249ae4fc1e87390b83a1af6b7db8c9cdb 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 d5bb34529299ab4957c5e87ac6ca7c7227cf0dd6..c0d0ceef89878439642b596b4afcfcc0841f40ee 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 3c1be618ba16ebc3d1dd9979ad02156d1745dec3..11dd96d3b4d8a060587151cc2780b5bc9600ec65 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 8b2774b009e0ecf56f7ec6534d554883e120de6a..364240254087e56bf46572040c84d4f91ea8114e 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 ec2c2cc75dffcd80f844d884326056f6bb1e0838..4fe2f3d787805da34e88c24a3242b830c8b1b49b 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 c81c172e9015d925f8f263546512d246b006f319..3d69ef7388baf0b4c753e77c7c9eb0270a357533 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 a1186cae70721f41706aaad890295dc09f418778..ce9ead3c5cd209047e4f45bdba08c43803034008 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 dda3fa35c3898550d479dc3c7a04631ed7bdff58..f25519539c2720a03dad52d686dfd2eb00e69ef4 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 ec9faec0a64435e9f659df51ed912eb91887e9ba..bb5d59c2423a56b15ea801d39db3b2645bfbbbaa 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 2130fd4ac8cb3990c2199256e0d50c7af0134080..636fd969ced1391e35abf1125ce33fde7816228f 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 ead4484ba216bfc3b394fa8fe5d788631ceaa786..fc871630551637287368675c9c37a99c33739620 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 62fa2ee098283efc2329b65b85bfdc8cf12cc08b..a7a19adee7a9b86c8581d3c826aacd3341a8476d 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 ff06102cd2e27b573898b6fdd287d3c60cee8327..373c8527f400bff23ea506f647f1f5fa8718f554 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 7e6cb6fb28bbf8695b86a781a36bf2fbbb181643..adb283032969bcf25f1ce5b05927a9bac5409a9c 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 f635521b65eef6a6e53f14ebf3afd84bdb025d88..fcc5a96729165b65ec544a8082d217fab8147b57 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 0e374d07a0768810bebb3003a06ac89c9c20ea4c..5b58f930773ee1ec79edf32d4a3a5a3d4979d2b1 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 100951540f2e882511a4c37e4f0568abdd893929..d3c59fc46fafbb3851e02340599231f017df7142 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 5b6900092dd866e10fd2fcf32dd67852a36c7b14..8bf5014687f4b039b09e3d57497d18e4f5f0baab 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 f6e8f72514282cd633086adc11c7c7e99ffc11b4..eb99a140b5782fe48ad472311d3c0352b4867aed 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 13fa5c391db99ff4f8a257df9c078e85ee555fc8..8afee7561192d322e2d8f59a88a69e8c8466df56 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 e078c803b03600827e585c1af7c4755e455917d9..4a7a5d9b6c258b77d16e89f98aa43b47f6f42bb9 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 ef0885887750d87dc9263a3d581e4407470ef9de..30c18095d309b9ece4d2a5ba71ad6a2207e440d7 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 c1251608e85f597d28b26979250887c5dd919ef4..bcda35d06576d65637d61201e74a5f2bb691cdc4 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 93fcb53687f2089440e136f6262a8eee685b7bc7..0d335ebe4f27325c59a6c1e6ff017f4c71f37462 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 e04bc23d7d42253545fa621c91903765eedb6d33..582ef8d6e42bd1212c21e057781ab0752898bf35 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 63b4f5b7e57a57100ba8283351431859c4080546..85ccca10aec0f05f2122362f01ce99a526401541 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 2a6c2e8c71af53104a896d347671794deab2555e..ad9a9ab94ab0e5314e486be35f28cd5f0e26decc 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 9b5296fbe702e694f4ad09b9313fb36a00d877b4..de82c8adbbcfbc82fca203f96260e262357cba83 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 4649f38367e7fa95983b5acc87551c04e3716d6f..664071df7ec16dbdfc045020b3ad607cf2f4a905 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 181b2d64bbea461614ff6b7ee578fb7542f0a095..2a5ae7b407c486b657594485623948becebf05d2 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 1985d838872fd8ab2fe08583285d41a3d80be5a1..070689829cb11e55ab1baff86d7df7a2ae263f28 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 12ebdb152a13d18b1877c5273472078cfdca570e..bcec37713caced921d00994c9526c7178f8b3bb6 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 f4bb144ffddfb4c81318c1f6c9be0e6e8f971f29..ab41bab98fffe49ef7901e417171a8a2c5244eac 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
  */