fixes for go, removed some unnessary stuff