Disk Driver Vault Deletion Fix

JIRA: CBDEUCE-129
- More re-use