Centralize vault cleanup
Merge pull request #6751 from bstansberry/clean-vault

Centralize vault cleanup