Taking out unused pacakge, and gofmt