Resolve #2648272 "Remove outdated code"

Pierre Rudloffrequested to merge
issue/drupal-2648272:2648272-remove-outdated-code into main

Closes #2648272

Merge request reports