Really remove dependency on Vault