Resolve #3622600 "Remove remaining uses"

quietonerequested to merge
issue/drupal-3622600:3622600-remove-remaining-uses into main

Closes #3622600

Merge request reports