Remove unreachable code
Tag fields to make go vet happy