Remove code unreachable using Go 1.1
Merge pull request #970 from titanous/go1.1-unreachable

Remove code unreachable using Go 1.1