Clean up Vault code and add ability for internal economy to hook Vault.