diff --git a/modules/core/ui/metrics/src/Plugin/Block/FarmMetricsBlock.php b/modules/core/ui/metrics/src/Plugin/Block/FarmMetricsBlock.php
index bb736964..d3ae73bc 100644
--- a/modules/core/ui/metrics/src/Plugin/Block/FarmMetricsBlock.php
+++ b/modules/core/ui/metrics/src/Plugin/Block/FarmMetricsBlock.php
@@ -151,8 +151,6 @@ class FarmMetricsBlock extends BlockBase implements ContainerFactoryPluginInterf
         $query->condition('status', 'active');
       }
 
-      // @todo https://github.com/mglaman/phpstan-drupal/issues/474
-      // @phpstan-ignore-next-line
       $count = $query->count()->execute();
       $route_name = "view.farm_$entity_type.page_type";
       $metrics[] = Link::createFromRoute($bundle_info['label'] . ': ' . $count, $route_name, ['arg_0' => $bundle], ['attributes' => ['class' => ['metric', 'button']]])->toString();
diff --git a/modules/core/ui/views/src/Access/FarmAssetChildrenViewsAccessCheck.php b/modules/core/ui/views/src/Access/FarmAssetChildrenViewsAccessCheck.php
index 0ce05152..219abf44 100644
--- a/modules/core/ui/views/src/Access/FarmAssetChildrenViewsAccessCheck.php
+++ b/modules/core/ui/views/src/Access/FarmAssetChildrenViewsAccessCheck.php
@@ -63,8 +63,6 @@ class FarmAssetChildrenViewsAccessCheck implements AccessInterface {
 
     // Run a count query to see if there are any assets that reference this
     // asset as a parent.
-    // @todo https://github.com/mglaman/phpstan-drupal/issues/474
-    // @phpstan-ignore-next-line
     $count = $this->assetStorage->getAggregateQuery()
       ->accessCheck(TRUE)
       ->condition('parent.entity.id', $asset_id)
diff --git a/modules/core/ui/views/src/Access/FarmAssetLogViewsAccessCheck.php b/modules/core/ui/views/src/Access/FarmAssetLogViewsAccessCheck.php
index e9447757..046d99b0 100644
--- a/modules/core/ui/views/src/Access/FarmAssetLogViewsAccessCheck.php
+++ b/modules/core/ui/views/src/Access/FarmAssetLogViewsAccessCheck.php
@@ -62,8 +62,6 @@ class FarmAssetLogViewsAccessCheck implements AccessInterface {
     $query->condition($reference_condition);
 
     // Determine access based on the log count.
-    // @todo https://github.com/mglaman/phpstan-drupal/issues/474
-    // @phpstan-ignore-next-line
     $count = $query->execute();
     $access = AccessResult::allowedIf($count > 0);
 
diff --git a/modules/log/birth/src/Plugin/Validation/Constraint/UniqueBirthLogConstraintValidator.php b/modules/log/birth/src/Plugin/Validation/Constraint/UniqueBirthLogConstraintValidator.php
index 6e52abdd..30d8212e 100644
--- a/modules/log/birth/src/Plugin/Validation/Constraint/UniqueBirthLogConstraintValidator.php
+++ b/modules/log/birth/src/Plugin/Validation/Constraint/UniqueBirthLogConstraintValidator.php
@@ -66,8 +66,6 @@ class UniqueBirthLogConstraintValidator extends ConstraintValidator implements C
 
       // Query the number of birth logs that reference the asset.
       // We do not check access to ensure that all matching logs are found.
-      // @todo https://github.com/mglaman/phpstan-drupal/issues/474
-      // @phpstan-ignore-next-line
       $count = $this->entityTypeManager->getStorage('log')->getAggregateQuery()
         ->accessCheck(FALSE)
         ->condition('type', 'birth')