PVB cleanup
Merge pull request #1 from ministryofjustice/pvb-cleanup

PVB cleanup