Removed Vault Depedancy and small re-write of code.