diff --git a/.phive/phars.xml b/.phive/phars.xml
index b3c9592eb..642921def 100644
--- a/.phive/phars.xml
+++ b/.phive/phars.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpstan" version="1.9.12" installed="1.9.12" location="./tools/phpstan" copy="false"/>
-  <phar name="psalm" version="5.4.0" installed="5.4.0" location="./tools/psalm" copy="false"/>
+  <phar name="phpstan" version="1.10.14" installed="1.10.14" location="./tools/phpstan" copy="false"/>
+  <phar name="psalm" version="5.10.0" installed="5.10.0" location="./tools/psalm" copy="false"/>
 </phive>
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 44e591c5d..2cdf248ea 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,15 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <files psalm-version="4.x-dev@">
-  <file src="src/Controller/MailPreviewController.php">
-    <PossiblyInvalidArgument occurrences="1">
-      <code>$partType</code>
-    </PossiblyInvalidArgument>
-  </file>
-  <file src="src/Database/Log/DebugLog.php">
-    <InternalProperty occurrences="1">
-      <code>$query-&gt;query</code>
-    </InternalProperty>
-  </file>
   <file src="src/DebugInclude.php">
     <PossiblyNullArrayOffset occurrences="2">
       <code>$this-&gt;_composerPaths</code>
@@ -27,9 +17,6 @@
     </PossiblyNullArrayOffset>
   </file>
   <file src="src/Mailer/MailPreview.php">
-    <DeprecatedTrait occurrences="1">
-      <code>ModelAwareTrait</code>
-    </DeprecatedTrait>
     <PossiblyFalseOperand occurrences="1">
       <code>$pos</code>
     </PossiblyFalseOperand>
@@ -45,29 +32,10 @@
       <code>new $className($config)</code>
     </PropertyTypeCoercion>
   </file>
-  <file src="src/Panel/DeprecationsPanel.php">
-    <InvalidScalarArgument occurrences="4">
-      <code>$pluginName</code>
-      <code>$return['plugins']</code>
-      <code>$return['vendor']</code>
-      <code>$vendorName</code>
-    </InvalidScalarArgument>
-  </file>
-  <file src="src/Panel/IncludePanel.php">
-    <InvalidScalarArgument occurrences="4">
-      <code>$pluginName</code>
-      <code>$return['plugins']</code>
-      <code>$return['vendor']</code>
-      <code>$vendorName</code>
-    </InvalidScalarArgument>
-  </file>
   <file src="src/Panel/PanelRegistry.php">
     <LessSpecificImplementedReturnType occurrences="1">
       <code>string|null</code>
     </LessSpecificImplementedReturnType>
-    <MoreSpecificImplementedParamType occurrences="1">
-      <code>$class</code>
-    </MoreSpecificImplementedParamType>
     <UnsafeInstantiation occurrences="1">
       <code>new $class($this, $config)</code>
     </UnsafeInstantiation>
@@ -78,19 +46,11 @@
     </UndefinedInterfaceMethod>
   </file>
   <file src="src/View/Helper/ToolbarHelper.php">
-    <DeprecatedMethod occurrences="1">
-      <code>makeNeatArray</code>
-    </DeprecatedMethod>
     <InternalClass occurrences="1">
       <code>new HtmlFormatter()</code>
     </InternalClass>
     <InternalMethod occurrences="1">
       <code>dump</code>
     </InternalMethod>
-    <InvalidArgument occurrences="3">
-      <code>$currentAncestors</code>
-      <code>$value</code>
-      <code>$values</code>
-    </InvalidArgument>
   </file>
 </files>
diff --git a/psalm.xml b/psalm.xml
index afe253290..60b81594c 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -7,6 +7,9 @@
     autoloader="tests/bootstrap.php"
     usePhpDocMethodsWithoutMagicCall="true"
     errorBaseline="psalm-baseline.xml"
+    findUnusedPsalmSuppress="true"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
 >
     <projectFiles>
         <directory name="src" />
diff --git a/src/Cache/Engine/DebugEngine.php b/src/Cache/Engine/DebugEngine.php
index 46a839f50..d976fef2e 100644
--- a/src/Cache/Engine/DebugEngine.php
+++ b/src/Cache/Engine/DebugEngine.php
@@ -342,7 +342,6 @@ public function __toString(): string
             return str_replace('Engine', '', $class);
         }
 
-        /** @psalm-suppress UndefinedMethod */
         return $this->_config['className'];
     }
 }