diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7197897..5c24556 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,35 @@
 # Changelog
 
 
+## 2.1.1 (2023-03-04)
+
+### Tasks
+
+* Remove unused code. [Ralf Zimmermann]
+
+* Make psalm happy. [Ralf Zimmermann]
+
+### Other
+
+* Merge tag '2.1.0' into develop. [Ralf Zimmermann]
+
+  2.1.0
+
+
 ## 2.1.0 (2023-03-04)
 
 ### Features
 
 * Overwritable login provider templates #12. [Ralf Zimmermann]
 
+### Tasks
+
+* Update 2.1.0. [Ralf Zimmermann]
+
 ### Other
 
+* Merge branch 'release/2.1.0' into main. [Ralf Zimmermann]
+
 * Merge tag '2.0.2' into develop. [Ralf Zimmermann]
 
   2.0.2
diff --git a/Documentation/Changelog.rst b/Documentation/Changelog.rst
index ea84c6e..54dd8ee 100644
--- a/Documentation/Changelog.rst
+++ b/Documentation/Changelog.rst
@@ -2,15 +2,35 @@ Changelog
 =========
 
 
+2.1.1 (2023-03-04)
+------------------
+
+Tasks
+~~~~~
+- Remove unused code. [Ralf Zimmermann]
+- Make psalm happy. [Ralf Zimmermann]
+
+Other
+~~~~~
+- Merge tag '2.1.0' into develop. [Ralf Zimmermann]
+
+  2.1.0
+
+
 2.1.0 (2023-03-04)
 ------------------
 
+Tasks
+~~~~~
+- Update 2.1.0. [Ralf Zimmermann]
+
 Features
 ~~~~~~~~
 - Overwritable login provider templates #12. [Ralf Zimmermann]
 
 Other
 ~~~~~
+- Merge branch 'release/2.1.0' into main. [Ralf Zimmermann]
 - Merge tag '2.0.2' into develop. [Ralf Zimmermann]
 
   2.0.2
diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg
index 80a9e15..7e84661 100644
--- a/Documentation/Settings.cfg
+++ b/Documentation/Settings.cfg
@@ -25,7 +25,7 @@ project     = TYPO3 OAuth2 Login Client (backend and frontend)
 # ...   (recommended) version, displayed next to title (desktop) and in <meta name="book-version"
 # .................................................................................
 
-release     = 2.1.0
+release     = 2.1.1
 
 # .................................................................................
 # ...  (recommended) displayed in footer
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 051d302..e304794 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -20,6 +20,11 @@
       <code>new ImmediateResponseException($response, 1643006821)</code>
     </InternalMethod>
   </file>
+  <file src="Classes/Backend/LoginProvider/Oauth2LoginProvider.php">
+    <InternalMethod occurrences="1">
+      <code>setTemplate</code>
+    </InternalMethod>
+  </file>
   <file src="Classes/Controller/Backend/ManageProvidersController.php">
     <InternalMethod occurrences="1">
       <code>setTemplate</code>
diff --git a/build/release/ext_emconf.php b/build/release/ext_emconf.php
index 8bfa4d5..610aec8 100644
--- a/build/release/ext_emconf.php
+++ b/build/release/ext_emconf.php
@@ -10,7 +10,7 @@
     'state'            => 'stable',
     'uploadfolder'     => '0',
     'clearCacheOnLoad' => 1,
-    'version'          => '2.1.0',
+    'version'          => '2.1.1',
     'constraints'      => [
         'depends' => [
             'backend' => '10.4.0-11.5.99',
diff --git a/ext_emconf.php b/ext_emconf.php
index 14bcb52..19a9bce 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -10,7 +10,7 @@
     'state'            => 'stable',
     'uploadfolder'     => '0',
     'clearCacheOnLoad' => 1,
-    'version'          => '2.1.0',
+    'version'          => '2.1.1',
     'constraints'      => [
         'depends' => [
             'backend' => '10.4.0-11.5.99',
diff --git a/ext_localconf.php b/ext_localconf.php
index 84ad9b2..b92ab0f 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -2,10 +2,6 @@
 
 defined('TYPO3') || die();
 
-if (file_exists(__DIR__ . '/Resources/Private/PHP/autoload.php')) {
-    require_once(__DIR__ . '/Resources/Private/PHP/autoload.php');
-}
-
 (static function () {
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addService(
         'oauth2_client',