Resolve #3571057 "Remove deprecated code"

Stephen Mustgraverequested to merge
issue/drupal-3571057:3571057-remove-deprecated-code into main

Closes #3571057

Merge request reports