Remove unused function
cleanup go vet errors