Refactor pvcCleaner #3635
Description
Is your feature request related to a problem? Please describe.
Refactor pvcCleaner. Right now we have few almost the same templates and would be nice to merge into one file or use tpl to follow DRY
original thread: #3634 (comment)