Remove redundant code from Go version