diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index b6e09dce..22164e32 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -54,6 +54,12 @@
       <code>DispatchableInterface</code>
     </UndefinedDocblockClass>
   </file>
+  <file src="src/AbstractFactoryInterface.php">
+    <PossiblyUnusedMethod>
+      <code>canCreateServiceWithName</code>
+      <code>createServiceWithName</code>
+    </PossiblyUnusedMethod>
+  </file>
   <file src="src/AbstractPluginManager.php">
     <ArgumentTypeCoercion>
       <code>$config</code>
@@ -77,9 +83,6 @@
     <RedundantConditionGivenDocblockType>
       <code>is_object($configInstanceOrParentLocator)</code>
     </RedundantConditionGivenDocblockType>
-    <UnusedPsalmSuppress>
-      <code>MixedAssignment</code>
-    </UnusedPsalmSuppress>
   </file>
   <file src="src/Config.php">
     <DeprecatedInterface>
@@ -94,10 +97,14 @@
     <MoreSpecificReturnType>
       <code>ServiceManagerConfigurationType</code>
     </MoreSpecificReturnType>
-    <UnusedPsalmSuppress>
-      <code>MixedReturnTypeCoercion</code>
-      <code>MixedReturnTypeCoercion</code>
-    </UnusedPsalmSuppress>
+    <UnusedProperty>
+      <code>$allowedKeys</code>
+    </UnusedProperty>
+  </file>
+  <file src="src/DelegatorFactoryInterface.php">
+    <PossiblyUnusedMethod>
+      <code>createDelegatorWithName</code>
+    </PossiblyUnusedMethod>
   </file>
   <file src="src/Exception/CyclicAliasException.php">
     <InvalidArgument>
@@ -117,6 +124,16 @@
       <code>new $requestedName()</code>
     </InvalidStringClass>
   </file>
+  <file src="src/FactoryInterface.php">
+    <UnusedClass>
+      <code>FactoryInterface</code>
+    </UnusedClass>
+  </file>
+  <file src="src/InitializerInterface.php">
+    <UnusedClass>
+      <code>InitializerInterface</code>
+    </UnusedClass>
+  </file>
   <file src="src/Proxy/LazyServiceFactory.php">
     <MissingClosureParamType>
       <code>$wrappedInstance</code>
@@ -218,6 +235,9 @@
       <code>$service</code>
       <code>$target</code>
     </UnusedForeachValue>
+    <UnusedReturnValue>
+      <code>DelegatorsConfiguration</code>
+    </UnusedReturnValue>
     <UnusedVariable>
       <code>$key</code>
     </UnusedVariable>
@@ -484,7 +504,6 @@
       <code><![CDATA[$object[$shared ? $method : 'build'][]]]></code>
       <code>$second</code>
       <code>$shared</code>
-      <code>$shared</code>
     </MixedAssignment>
     <MixedFunctionCall>
       <code>$callback()</code>
@@ -606,6 +625,9 @@
       <code><![CDATA[$instance->foo]]></code>
       <code><![CDATA[$instance->option]]></code>
     </MixedPropertyFetch>
+    <PossiblyUnusedMethod>
+      <code>sampleFactory</code>
+    </PossiblyUnusedMethod>
     <UnusedClosureParam>
       <code>$container</code>
       <code>$container</code>
@@ -615,6 +637,11 @@
       <code>$name</code>
     </UnusedClosureParam>
   </file>
+  <file src="test/StaticAnalysis/ServiceManagerConfiguration.php">
+    <UnusedClass>
+      <code>ServiceManagerConfiguration</code>
+    </UnusedClass>
+  </file>
   <file src="test/Tool/ConfigDumperCommandTest.php">
     <MixedArgument>
       <code>$factoryConfig[ObjectWithObjectScalarDependency::class]</code>
diff --git a/psalm.xml.dist b/psalm.xml.dist
index d71e2eec..6760f4c2 100644
--- a/psalm.xml.dist
+++ b/psalm.xml.dist
@@ -6,6 +6,8 @@
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
     errorBaseline="psalm-baseline.xml"
     findUnusedPsalmSuppress="true"
+    findUnusedCode="true"
+    findUnusedBaselineEntry="true"
 >
     <projectFiles>
         <directory name="bin"/>
diff --git a/src/AbstractPluginManager.php b/src/AbstractPluginManager.php
index 1e113e12..0a652e5e 100644
--- a/src/AbstractPluginManager.php
+++ b/src/AbstractPluginManager.php
@@ -117,7 +117,6 @@ public function __construct($configInstanceOrParentLocator = null, array $config
     public function configure(array $config)
     {
         if (isset($config['services'])) {
-            /** @psalm-suppress MixedAssignment */
             foreach ($config['services'] as $service) {
                 $this->validate($service);
             }
diff --git a/src/Config.php b/src/Config.php
index f0ec9d5f..b7b6042c 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -94,11 +94,9 @@ public function toArray()
      * @psalm-param ServiceManagerConfigurationType $a
      * @psalm-param ServiceManagerConfigurationType $b
      * @psalm-return ServiceManagerConfigurationType
-     * @psalm-suppress MixedReturnTypeCoercion
      */
     private function merge(array $a, array $b)
     {
-        /** @psalm-suppress MixedReturnTypeCoercion */
         return ArrayUtils::merge($a, $b);
     }
 }