Remove code unreachable using Go 1.1