diff --git a/examples/helloworld/mock/generate_mock.sh b/examples/helloworld/mock/generate_mock.sh
deleted file mode 100755
index 2321021c..00000000
--- a/examples/helloworld/mock/generate_mock.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-mockgen google.golang.org/grpc/examples/helloworld/helloworld GreeterClient > mock_helloworld/hw_mock.go
-gofmt -w mock_helloworld/hw_mock.go
diff --git a/examples/helloworld/mock/hw_test.go b/examples/helloworld/mock/hw_test.go
index 5c134755..6f7b4f86 100644
--- a/examples/helloworld/mock/hw_test.go
+++ b/examples/helloworld/mock/hw_test.go
@@ -5,9 +5,9 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
-	proto "github.com/golang/protobuf/proto"
+	"github.com/golang/protobuf/proto"
 	"golang.org/x/net/context"
-	"google.golang.org/grpc/examples/helloworld/helloworld"
+	helloworld "google.golang.org/grpc/examples/helloworld/helloworld"
 	hwmock "google.golang.org/grpc/examples/helloworld/mock/mock_helloworld"
 )