Remove Vault Dependency