Remove changes which I want to keep
Simple fix for cgo
Remove unneeded cgo check
Ran gofmt