diff --git a/psalm.xml b/psalm.xml
index 74ee297..277e73d 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <psalm
     errorLevel="1"
+    findUnusedBaselineEntry="true"
     findUnusedCode="false"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
diff --git a/src/ClassConfigFactory.php b/src/ClassConfigFactory.php
index fb258a2..48da3f7 100644
--- a/src/ClassConfigFactory.php
+++ b/src/ClassConfigFactory.php
@@ -12,7 +12,6 @@
 use ReflectionMethod;
 use ReflectionNamedType;
 use ReflectionParameter;
-use ReflectionType;
 use ReflectionUnionType;
 use Yiisoft\Proxy\Config\ClassConfig;
 use Yiisoft\Proxy\Config\MethodConfig;
@@ -175,18 +174,13 @@ private function getMethodParameterConfig(ReflectionParameter $param): Parameter
     private function getMethodParameterTypeConfig(ReflectionParameter $param): ?TypeConfig
     {
         /**
-         * @var ReflectionIntersectionType|ReflectionNamedType|ReflectionUnionType|null $type
-         * @psalm-suppress UndefinedDocblockClass Needed for PHP 8.0 only, because ReflectionIntersectionType is
-         * not supported.
+         * @var ReflectionIntersectionType|ReflectionNamedType|ReflectionUnionType|null
          */
         $type = $param->getType();
         if (!$type) {
             return null;
         }
 
-        /**
-         * @psalm-suppress UndefinedClass Needed for PHP 8.0 only, because ReflectionIntersectionType is not supported.
-         */
         return new TypeConfig(
             name: $this->convertTypeToString($type, $param->getDeclaringClass()?->getName()),
             allowsNull: $type->allowsNull(),
@@ -204,32 +198,22 @@ private function getMethodReturnTypeConfig(ReflectionMethod $method): ?TypeConfi
     {
         $returnType = $method->getReturnType();
         if (!$returnType && method_exists($method, 'getTentativeReturnType')) {
-            /**
-             * Needed for PHP 8.0 only, because getTentativeReturnType() is not supported.
-             *
-             * @var ReflectionType|null
-             * @psalm-suppress UnnecessaryVarAnnotation
-             */
             $returnType = $method->getTentativeReturnType();
         }
+        /**
+         * @var ReflectionIntersectionType|ReflectionNamedType|ReflectionUnionType|null $returnType
+         */
 
         if (!$returnType) {
             return null;
         }
 
-        /**
-         * @psalm-suppress ArgumentTypeCoercion Needed for PHP 8.0 only, because ReflectionIntersectionType is
-         * not supported.
-         */
         return new TypeConfig(
             name: $this->convertTypeToString($returnType, $method->getDeclaringClass()->getName()),
             allowsNull: $returnType->allowsNull(),
         );
     }
 
-    /**
-     * @psalm-suppress UndefinedClass Needed for PHP 8.0 only, because ReflectionIntersectionType is not supported.
-     */
     private function convertTypeToString(
         ReflectionNamedType|ReflectionUnionType|ReflectionIntersectionType $type,
         ?string $declaringClassName = null,