Use new goutils package
Remove race condition w/ get & set machines seen