diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index e442c2a5..c9b871c4 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -12,8 +12,6 @@
       <code><![CDATA[$closingBracket]]></code>
       <code><![CDATA[$closingBracket]]></code>
       <code><![CDATA[$closingBracket]]></code>
-      <code><![CDATA[$closingBracket]]></code>
-      <code><![CDATA[$closingBracket]]></code>
     </MissingConstructor>
     <MixedArgument>
       <code><![CDATA[$val]]></code>
@@ -36,11 +34,6 @@
       <code><![CDATA[plugin]]></code>
     </UndefinedInterfaceMethod>
   </file>
-  <file src="src/Helper/Asset.php">
-    <PossiblyUnusedMethod>
-      <code><![CDATA[setResourceMap]]></code>
-    </PossiblyUnusedMethod>
-  </file>
   <file src="src/Helper/Cycle.php">
     <ImplementedReturnTypeMismatch>
       <code><![CDATA[Cycle]]></code>
@@ -135,43 +128,6 @@
       <code><![CDATA[$value[$k]]]></code>
     </MixedAssignment>
   </file>
-  <file src="src/Helper/FlashMessenger.php">
-    <DocblockTypeContradiction>
-      <code><![CDATA[null === $this->pluginFlashMessenger]]></code>
-    </DocblockTypeContradiction>
-    <MissingClosureParamType>
-      <code><![CDATA[$item]]></code>
-    </MissingClosureParamType>
-    <MissingConstructor>
-      <code><![CDATA[$escapeHtmlHelper]]></code>
-      <code><![CDATA[$pluginFlashMessenger]]></code>
-    </MissingConstructor>
-    <MixedArgument>
-      <code><![CDATA[$item]]></code>
-      <code><![CDATA[$item]]></code>
-    </MixedArgument>
-    <MixedArgumentTypeCoercion>
-      <code><![CDATA[$classes]]></code>
-      <code><![CDATA[$classes]]></code>
-      <code><![CDATA[$messagesToPrint]]></code>
-    </MixedArgumentTypeCoercion>
-    <MixedAssignment>
-      <code><![CDATA[$classes]]></code>
-      <code><![CDATA[$classes]]></code>
-      <code><![CDATA[$messagesToPrint[]]]></code>
-      <code><![CDATA[$messagesToPrint[]]]></code>
-      <code><![CDATA[$this->escapeHtmlHelper]]></code>
-    </MixedAssignment>
-    <RedundantCastGivenDocblockType>
-      <code><![CDATA[(bool) $autoEscape]]></code>
-      <code><![CDATA[(string) $messageCloseString]]></code>
-      <code><![CDATA[(string) $messageOpenFormat]]></code>
-      <code><![CDATA[(string) $messageSeparatorString]]></code>
-    </RedundantCastGivenDocblockType>
-    <RedundantConditionGivenDocblockType>
-      <code><![CDATA[$this->escapeHtmlHelper]]></code>
-    </RedundantConditionGivenDocblockType>
-  </file>
   <file src="src/Helper/Gravatar.php">
     <DocblockTypeContradiction>
       <code><![CDATA[$flag === null]]></code>
@@ -196,9 +152,6 @@
       <code><![CDATA[$this->options['rating']]]></code>
       <code><![CDATA[$this->options['secure']]]></code>
     </MixedReturnStatement>
-    <PossiblyUnusedReturnValue>
-      <code><![CDATA[array<string, mixed>]]></code>
-    </PossiblyUnusedReturnValue>
     <RedundantCastGivenDocblockType>
       <code><![CDATA[(bool) $flag]]></code>
       <code><![CDATA[(int) $imgSize]]></code>
@@ -422,26 +375,6 @@
       <code><![CDATA[HelperInterface]]></code>
     </PossiblyUnusedReturnValue>
   </file>
-  <file src="src/Helper/HtmlFlash.php">
-    <MixedAssignment>
-      <code><![CDATA[$htmlObject]]></code>
-    </MixedAssignment>
-    <MixedFunctionCall>
-      <code><![CDATA[$htmlObject($data, self::TYPE, $attribs, $params, $content)]]></code>
-    </MixedFunctionCall>
-    <MixedInferredReturnType>
-      <code><![CDATA[string]]></code>
-    </MixedInferredReturnType>
-    <MixedReturnStatement>
-      <code><![CDATA[$htmlObject($data, self::TYPE, $attribs, $params, $content)]]></code>
-    </MixedReturnStatement>
-    <PossiblyNullReference>
-      <code><![CDATA[plugin]]></code>
-    </PossiblyNullReference>
-    <UndefinedInterfaceMethod>
-      <code><![CDATA[plugin]]></code>
-    </UndefinedInterfaceMethod>
-  </file>
   <file src="src/Helper/HtmlObject.php">
     <MixedArgument>
       <code><![CDATA[$options]]></code>
@@ -473,26 +406,6 @@
       <code><![CDATA[plugin]]></code>
     </UndefinedInterfaceMethod>
   </file>
-  <file src="src/Helper/HtmlQuicktime.php">
-    <MixedAssignment>
-      <code><![CDATA[$htmlObject]]></code>
-    </MixedAssignment>
-    <MixedFunctionCall>
-      <code><![CDATA[$htmlObject($data, self::TYPE, $attribs, $params, $content)]]></code>
-    </MixedFunctionCall>
-    <MixedInferredReturnType>
-      <code><![CDATA[string]]></code>
-    </MixedInferredReturnType>
-    <MixedReturnStatement>
-      <code><![CDATA[$htmlObject($data, self::TYPE, $attribs, $params, $content)]]></code>
-    </MixedReturnStatement>
-    <PossiblyNullReference>
-      <code><![CDATA[plugin]]></code>
-    </PossiblyNullReference>
-    <UndefinedInterfaceMethod>
-      <code><![CDATA[plugin]]></code>
-    </UndefinedInterfaceMethod>
-  </file>
   <file src="src/Helper/HtmlTag.php">
     <MixedArgument>
       <code><![CDATA[$value]]></code>
@@ -510,12 +423,6 @@
       <code><![CDATA[(bool) $useNamespaces]]></code>
     </RedundantCastGivenDocblockType>
   </file>
-  <file src="src/Helper/Identity.php">
-    <PossiblyUnusedMethod>
-      <code><![CDATA[getAuthenticationService]]></code>
-      <code><![CDATA[setAuthenticationService]]></code>
-    </PossiblyUnusedMethod>
-  </file>
   <file src="src/Helper/Json.php">
     <MissingConstructor>
       <code><![CDATA[$response]]></code>
@@ -1119,7 +1026,6 @@
       <code><![CDATA[(string) $key]]></code>
       <code><![CDATA[(string) $key]]></code>
       <code><![CDATA[(string) $key]]></code>
-      <code><![CDATA[(string) $name]]></code>
     </RedundantCastGivenDocblockType>
     <UnsafeInstantiation>
       <code><![CDATA[new $this->containerClass($value)]]></code>
@@ -1206,9 +1112,6 @@
     </UnsafeInstantiation>
   </file>
   <file src="src/Helper/Placeholder/Registry.php">
-    <DocblockTypeContradiction>
-      <code><![CDATA[null === static::$instance]]></code>
-    </DocblockTypeContradiction>
     <InvalidStringClass>
       <code><![CDATA[new $this->containerClass($value)]]></code>
     </InvalidStringClass>
@@ -1224,10 +1127,9 @@
     <MoreSpecificReturnType>
       <code><![CDATA[AbstractContainer]]></code>
     </MoreSpecificReturnType>
-    <PossiblyUnusedMethod>
-      <code><![CDATA[getRegistry]]></code>
-      <code><![CDATA[unsetRegistry]]></code>
-    </PossiblyUnusedMethod>
+    <PossiblyUnusedProperty>
+      <code><![CDATA[$instance]]></code>
+    </PossiblyUnusedProperty>
     <RedundantCastGivenDocblockType>
       <code><![CDATA[(string) $key]]></code>
       <code><![CDATA[(string) $key]]></code>
@@ -1235,9 +1137,6 @@
       <code><![CDATA[(string) $key]]></code>
       <code><![CDATA[(string) $key]]></code>
     </RedundantCastGivenDocblockType>
-    <UnsafeInstantiation>
-      <code><![CDATA[new static()]]></code>
-    </UnsafeInstantiation>
   </file>
   <file src="src/Helper/RenderChildModel.php">
     <MissingConstructor>
@@ -1311,11 +1210,6 @@
       <code><![CDATA[$_SERVER['HTTPS'] === true]]></code>
     </TypeDoesNotContainType>
   </file>
-  <file src="src/Helper/Service/AssetFactory.php">
-    <PossiblyNullArgument>
-      <code><![CDATA[$cName]]></code>
-    </PossiblyNullArgument>
-  </file>
   <file src="src/Helper/Service/DoctypeFactory.php">
     <MixedArgument>
       <code><![CDATA[$config['view_helper_config']['doctype']]]></code>
@@ -1328,50 +1222,7 @@
       <code><![CDATA[$config]]></code>
     </MixedAssignment>
   </file>
-  <file src="src/Helper/Service/FlashMessengerFactory.php">
-    <DeprecatedClass>
-      <code><![CDATA[FlashMessenger]]></code>
-      <code><![CDATA[FlashMessenger]]></code>
-      <code><![CDATA[new FlashMessenger()]]></code>
-    </DeprecatedClass>
-    <DeprecatedInterface>
-      <code><![CDATA[FlashMessengerFactory]]></code>
-    </DeprecatedInterface>
-    <MixedArgument>
-      <code><![CDATA[$configHelper['message_close_string']]]></code>
-      <code><![CDATA[$configHelper['message_open_format']]]></code>
-      <code><![CDATA[$configHelper['message_separator_string']]]></code>
-      <code><![CDATA[$flashMessenger]]></code>
-    </MixedArgument>
-    <MixedArrayAccess>
-      <code><![CDATA[$configHelper['message_close_string']]]></code>
-      <code><![CDATA[$configHelper['message_open_format']]]></code>
-      <code><![CDATA[$configHelper['message_separator_string']]]></code>
-      <code><![CDATA[$config['view_helper_config']]]></code>
-      <code><![CDATA[$config['view_helper_config']['flashmessenger']]]></code>
-    </MixedArrayAccess>
-    <MixedAssignment>
-      <code><![CDATA[$config]]></code>
-      <code><![CDATA[$configHelper]]></code>
-      <code><![CDATA[$controllerPluginManager]]></code>
-      <code><![CDATA[$flashMessenger]]></code>
-    </MixedAssignment>
-    <MixedMethodCall>
-      <code><![CDATA[get]]></code>
-    </MixedMethodCall>
-    <ParamNameMismatch>
-      <code><![CDATA[$container]]></code>
-    </ParamNameMismatch>
-    <PossiblyNullArgument>
-      <code><![CDATA[$requestedName]]></code>
-    </PossiblyNullArgument>
-  </file>
   <file src="src/Helper/TranslatorAwareTrait.php">
-    <DeprecatedClass>
-      <code><![CDATA[$this]]></code>
-      <code><![CDATA[$this]]></code>
-      <code><![CDATA[$this]]></code>
-    </DeprecatedClass>
     <RedundantCastGivenDocblockType>
       <code><![CDATA[(bool) $enabled]]></code>
     </RedundantCastGivenDocblockType>
@@ -1461,22 +1312,6 @@
       <code><![CDATA[clearVariables]]></code>
     </MissingReturnType>
   </file>
-  <file src="src/Model/ConsoleModel.php">
-    <MixedInferredReturnType>
-      <code><![CDATA[int]]></code>
-    </MixedInferredReturnType>
-    <MixedReturnStatement>
-      <code><![CDATA[$this->options['errorLevel']]]></code>
-    </MixedReturnStatement>
-    <NonInvariantDocblockPropertyType>
-      <code><![CDATA[$captureTo]]></code>
-    </NonInvariantDocblockPropertyType>
-    <PossiblyUnusedMethod>
-      <code><![CDATA[getErrorLevel]]></code>
-      <code><![CDATA[getResult]]></code>
-      <code><![CDATA[setResult]]></code>
-    </PossiblyUnusedMethod>
-  </file>
   <file src="src/Model/FeedModel.php">
     <MixedAssignment>
       <code><![CDATA[$this->type]]></code>
@@ -1547,30 +1382,6 @@
       <code><![CDATA[is_object($variables)]]></code>
     </RedundantConditionGivenDocblockType>
   </file>
-  <file src="src/Renderer/ConsoleRenderer.php">
-    <ImplementedParamTypeMismatch>
-      <code><![CDATA[$values]]></code>
-    </ImplementedParamTypeMismatch>
-    <MixedAssignment>
-      <code><![CDATA[$value]]></code>
-    </MixedAssignment>
-    <MixedOperand>
-      <code><![CDATA[$this->getFilterChain()->filter($values['result'])]]></code>
-    </MixedOperand>
-    <ParamNameMismatch>
-      <code><![CDATA[$model]]></code>
-    </ParamNameMismatch>
-    <PossiblyInvalidArgument>
-      <code><![CDATA[$values]]></code>
-    </PossiblyInvalidArgument>
-    <PossiblyUnusedMethod>
-      <code><![CDATA[__construct]]></code>
-      <code><![CDATA[setFilterChain]]></code>
-    </PossiblyUnusedMethod>
-    <PossiblyUnusedParam>
-      <code><![CDATA[$config]]></code>
-    </PossiblyUnusedParam>
-  </file>
   <file src="src/Renderer/FeedRenderer.php">
     <InvalidArgument>
       <code><![CDATA[(array) $nameOrModel]]></code>
@@ -1595,9 +1406,6 @@
     </RedundantConditionGivenDocblockType>
   </file>
   <file src="src/Renderer/JsonRenderer.php">
-    <ImplementedReturnTypeMismatch>
-      <code><![CDATA[void]]></code>
-    </ImplementedReturnTypeMismatch>
     <MissingConstructor>
       <code><![CDATA[$jsonpCallback]]></code>
     </MissingConstructor>
@@ -1740,19 +1548,11 @@
       <code><![CDATA[static::FAILURE_NOT_FOUND]]></code>
       <code><![CDATA[static::FAILURE_NO_PATHS]]></code>
     </DeprecatedConstant>
-    <DeprecatedMethod>
-      <code><![CDATA[setUseStreamWrapper]]></code>
-    </DeprecatedMethod>
     <DeprecatedProperty>
       <code><![CDATA[$this->lastLookupFailure]]></code>
       <code><![CDATA[$this->lastLookupFailure]]></code>
       <code><![CDATA[$this->lastLookupFailure]]></code>
       <code><![CDATA[$this->lastLookupFailure]]></code>
-      <code><![CDATA[$this->useStreamWrapper]]></code>
-      <code><![CDATA[$this->useStreamWrapper]]></code>
-      <code><![CDATA[$this->useViewStream]]></code>
-      <code><![CDATA[$this->useViewStream]]></code>
-      <code><![CDATA[$this->useViewStream]]></code>
     </DeprecatedProperty>
     <DocblockTypeContradiction>
       <code><![CDATA[is_string($path)]]></code>
@@ -1765,13 +1565,11 @@
       <code><![CDATA[$options['default_suffix']]]></code>
       <code><![CDATA[$options['lfi_protection']]]></code>
       <code><![CDATA[$options['script_paths']]]></code>
-      <code><![CDATA[$options['use_stream_wrapper']]]></code>
     </MixedArgument>
     <PossiblyUnusedReturnValue>
       <code><![CDATA[TemplatePathStack]]></code>
     </PossiblyUnusedReturnValue>
     <RedundantCastGivenDocblockType>
-      <code><![CDATA[(bool) $flag]]></code>
       <code><![CDATA[(bool) $flag]]></code>
       <code><![CDATA[(string) $defaultSuffix]]></code>
     </RedundantCastGivenDocblockType>
@@ -1830,48 +1628,6 @@
       <code><![CDATA[plugin]]></code>
     </UndefinedInterfaceMethod>
   </file>
-  <file src="src/Stream.php">
-    <MissingConstructor>
-      <code><![CDATA[$data]]></code>
-      <code><![CDATA[$stat]]></code>
-    </MissingConstructor>
-    <MissingParamType>
-      <code><![CDATA[$mode]]></code>
-      <code><![CDATA[$offset]]></code>
-      <code><![CDATA[$opened_path]]></code>
-      <code><![CDATA[$options]]></code>
-      <code><![CDATA[$whence]]></code>
-    </MissingParamType>
-    <MixedAssignment>
-      <code><![CDATA[$this->pos]]></code>
-      <code><![CDATA[$this->pos]]></code>
-      <code><![CDATA[$this->pos]]></code>
-    </MixedAssignment>
-    <MixedOperand>
-      <code><![CDATA[$offset]]></code>
-      <code><![CDATA[$offset]]></code>
-      <code><![CDATA[$offset]]></code>
-    </MixedOperand>
-    <PossiblyUnusedMethod>
-      <code><![CDATA[stream_eof]]></code>
-      <code><![CDATA[stream_open]]></code>
-      <code><![CDATA[stream_read]]></code>
-      <code><![CDATA[stream_seek]]></code>
-      <code><![CDATA[stream_stat]]></code>
-      <code><![CDATA[stream_tell]]></code>
-      <code><![CDATA[url_stat]]></code>
-    </PossiblyUnusedMethod>
-    <PossiblyUnusedParam>
-      <code><![CDATA[$mode]]></code>
-      <code><![CDATA[$opened_path]]></code>
-      <code><![CDATA[$options]]></code>
-    </PossiblyUnusedParam>
-    <UnevaluatedCode>
-      <code><![CDATA[break;]]></code>
-      <code><![CDATA[break;]]></code>
-      <code><![CDATA[break;]]></code>
-    </UnevaluatedCode>
-  </file>
   <file src="src/Variables.php">
     <MixedArgument>
       <code><![CDATA[$value]]></code>
@@ -2007,75 +1763,6 @@
       <code><![CDATA[$test]]></code>
     </MixedAssignment>
   </file>
-  <file src="test/Helper/FlashMessengerTest.php">
-    <ArgumentTypeCoercion>
-      <code><![CDATA[$plugin]]></code>
-      <code><![CDATA[$plugin]]></code>
-      <code><![CDATA[$this->mvcPluginClass]]></code>
-    </ArgumentTypeCoercion>
-    <DeprecatedClass>
-      <code><![CDATA[FlashMessenger]]></code>
-      <code><![CDATA[new Config([
-            'services'  => [
-                'config' => $config,
-            ],
-            'factories' => [
-                'ControllerPluginManager' => fn(ContainerInterface $services) => new PluginManager($services, [
-                    'invokables' => [
-                        'flashmessenger' => $this->mvcPluginClass,
-                    ],
-                ]),
-                'ViewHelperManager'       => static fn(ContainerInterface $services)
-                    => new HelperPluginManager($services),
-            ],
-        ])]]></code>
-      <code><![CDATA[new FlashMessenger()]]></code>
-      <code><![CDATA[new FlashMessenger()]]></code>
-      <code><![CDATA[new FlashMessenger()]]></code>
-      <code><![CDATA[new FlashMessenger()]]></code>
-      <code><![CDATA[new FlashMessenger()]]></code>
-      <code><![CDATA[new FlashMessenger()]]></code>
-    </DeprecatedClass>
-    <MixedAssignment>
-      <code><![CDATA[$displayInfo]]></code>
-      <code><![CDATA[$displayInfo]]></code>
-      <code><![CDATA[$displayInfo]]></code>
-      <code><![CDATA[$displayInfo]]></code>
-      <code><![CDATA[$helper]]></code>
-      <code><![CDATA[$helper]]></code>
-      <code><![CDATA[$helper]]></code>
-      <code><![CDATA[$helper]]></code>
-      <code><![CDATA[$helperPluginManager]]></code>
-      <code><![CDATA[$helperPluginManager]]></code>
-      <code><![CDATA[$helperPluginManager]]></code>
-      <code><![CDATA[$helperPluginManager]]></code>
-    </MixedAssignment>
-    <MixedMethodCall>
-      <code><![CDATA[get]]></code>
-      <code><![CDATA[get]]></code>
-      <code><![CDATA[get]]></code>
-      <code><![CDATA[get]]></code>
-      <code><![CDATA[render]]></code>
-      <code><![CDATA[render]]></code>
-      <code><![CDATA[renderCurrent]]></code>
-      <code><![CDATA[renderCurrent]]></code>
-    </MixedMethodCall>
-    <PossiblyInvalidMethodCall>
-      <code><![CDATA[hasCurrentErrorMessages]]></code>
-      <code><![CDATA[hasCurrentInfoMessages]]></code>
-      <code><![CDATA[hasCurrentMessages]]></code>
-      <code><![CDATA[hasCurrentSuccessMessages]]></code>
-      <code><![CDATA[hasErrorMessages]]></code>
-      <code><![CDATA[hasInfoMessages]]></code>
-      <code><![CDATA[hasMessages]]></code>
-      <code><![CDATA[hasSuccessMessages]]></code>
-      <code><![CDATA[hasWarningMessages]]></code>
-      <code><![CDATA[render]]></code>
-      <code><![CDATA[render]]></code>
-      <code><![CDATA[renderCurrent]]></code>
-      <code><![CDATA[renderCurrent]]></code>
-    </PossiblyInvalidMethodCall>
-  </file>
   <file src="test/Helper/GravatarTest.php">
     <PossiblyInvalidArgument>
       <code><![CDATA[$value]]></code>
@@ -2173,11 +1860,6 @@
       <code><![CDATA[offsetSetName]]></code>
     </UndefinedMagicMethod>
   </file>
-  <file src="test/Helper/HtmlFlashTest.php">
-    <DeprecatedClass>
-      <code><![CDATA[HtmlFlash]]></code>
-    </DeprecatedClass>
-  </file>
   <file src="test/Helper/HtmlListTest.php">
     <PossiblyUnusedParam>
       <code><![CDATA[$key]]></code>