diff --git a/src/GraphNavigator.php b/src/GraphNavigator.php
index e393e5680..10ca13e4a 100644
--- a/src/GraphNavigator.php
+++ b/src/GraphNavigator.php
@@ -4,7 +4,7 @@
 
 namespace JMS\Serializer;
 
-use JMS\Serializer\Exclusion\ExclusionStrategyInterface;
+use JMS\Serializer\Exclusion\DisjunctExclusionStrategy;
 
 /**
  * Handles traversal along the object graph.
@@ -32,7 +32,7 @@ abstract class GraphNavigator implements GraphNavigatorInterface
      */
     protected $format;
     /**
-     * @var ExclusionStrategyInterface
+     * @var DisjunctExclusionStrategy
      */
     protected $exclusionStrategy;
 
diff --git a/src/Metadata/Driver/AnnotationDriver.php b/src/Metadata/Driver/AnnotationDriver.php
index cc85112ba..8cda61bc3 100644
--- a/src/Metadata/Driver/AnnotationDriver.php
+++ b/src/Metadata/Driver/AnnotationDriver.php
@@ -186,7 +186,6 @@ public function loadMetadataForClass(\ReflectionClass $class): ?BaseClassMetadat
                         $propertyMetadata->serializedName = $annot->name;
                     } elseif ($annot instanceof SkipWhenEmpty) {
                         $propertyMetadata->skipWhenEmpty = true;
-                        // @Todo: Check the context about the configuration whether skipWhenEmpty on all properties.
                     } elseif ($annot instanceof Expose) {
                         $isExpose = true;
                         if (null !== $annot->if) {