This requires updating to a more recent version of golangci-lint, which has some new failures. This removes those failing linters, and I'll need to come back and look at those problems in a followup change.
also remove extra comments that aren't really needed