Cleanup and go1.1 vet