Removed Vault Dependancy, just for now