post-vault-removal cleanup
more cleanup