Wip 5997

Refactor scrub to use PGBackend methods

Fixes: #5997