Resolve #3548571 "Clean up content"

nicxvanrequested to merge
issue/drupal-3548571:3548571-clean-up-content into 11.x

Closes #3548571

Merge request reports