Removed Vault dependency. Is never needed!