Move cleanup

nicxvanrequested to merge
issue/drupal-3555152:3555152-move-skipproceduralhookscan-cleanup into 11.x

Closes #3555152

Merge request reports