remove unused code reported by go linter

Created by: sqs

I manually inspected the output of:

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

which we run in CI, and fixed some easy issues.