go vet cleanup
Merge branch 'vtgate'