Fix various issues reported by golang-ci

Created by: nicksnyder

Removes some dead code and simplifies some expressions (see commits for details).

golangci-lint run --build-tags=dev -v ./...