diff --git a/model/dependencies.go b/model/dependencies.go
index 992af93e8fe..2252a25b09f 100644
--- a/model/dependencies.go
+++ b/model/dependencies.go
@@ -4,7 +4,11 @@
 
 package model
 
+import (
+	modelv1 "github.com/jaegertracing/jaeger-idl/model/v1"
+)
+
 const (
 	// JaegerDependencyLinkSource describes a dependency diagram that was generated from Jaeger traces.
-	JaegerDependencyLinkSource = "jaeger"
+	JaegerDependencyLinkSource = modelv1.JaegerDependencyLinkSource
 )
diff --git a/model/doc.go b/model/doc.go
deleted file mode 100644
index bb8daf13905..00000000000
--- a/model/doc.go
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright (c) 2019 The Jaeger Authors.
-// Copyright (c) 2017 Uber Technologies, Inc.
-// SPDX-License-Identifier: Apache-2.0
-
-// Package model describes the internal data model for Trace and Span
-package model
diff --git a/model/span.go b/model/span.go
index 4dd58b4381c..9f640c259a7 100644
--- a/model/span.go
+++ b/model/span.go
@@ -11,11 +11,11 @@ import (
 type SamplerType = modelv1.SamplerType
 
 const (
-	SamplerTypeUnrecognized SamplerType = iota
-	SamplerTypeProbabilistic
-	SamplerTypeLowerBound
-	SamplerTypeRateLimiting
-	SamplerTypeConst
+	SamplerTypeUnrecognized  SamplerType = modelv1.SamplerTypeUnrecognized
+	SamplerTypeProbabilistic             = modelv1.SamplerTypeProbabilistic
+	SamplerTypeLowerBound                = modelv1.SamplerTypeLowerBound
+	SamplerTypeRateLimiting              = modelv1.SamplerTypeRateLimiting
+	SamplerTypeConst                     = modelv1.SamplerTypeConst
 )
 
 var toSamplerType = map[string]SamplerType{
diff --git a/model/trace.go b/model/trace.go
deleted file mode 100644
index 682cb6a5bff..00000000000
--- a/model/trace.go
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright (c) 2019 The Jaeger Authors.
-// Copyright (c) 2017 Uber Technologies, Inc.
-// SPDX-License-Identifier: Apache-2.0
-
-package model
diff --git a/proto-gen/api_v2/collector.go b/proto-gen/api_v2/collector.go
index 38544687a28..6e91bf60607 100644
--- a/proto-gen/api_v2/collector.go
+++ b/proto-gen/api_v2/collector.go
@@ -1,8 +1,6 @@
 package api_v2
 
 import (
-	_ "github.com/gogo/googleapis/google/api"
-	_ "github.com/gogo/protobuf/gogoproto"
 	modelv1 "github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
 )
 
@@ -25,8 +23,3 @@ type UnimplementedCollectorServiceServer = modelv1.UnimplementedCollectorService
 
 var RegisterCollectorServiceServer = modelv1.RegisterCollectorServiceServer
 
-var (
-	ErrInvalidLengthCollector        = modelv1.ErrInvalidLengthCollector
-	ErrIntOverflowCollector          = modelv1.ErrIntOverflowCollector
-	ErrUnexpectedEndOfGroupCollector = modelv1.ErrUnexpectedEndOfGroupCollector
-)
diff --git a/proto-gen/api_v2/query.go b/proto-gen/api_v2/query.go
index 18257079d10..c6ea40df2e6 100644
--- a/proto-gen/api_v2/query.go
+++ b/proto-gen/api_v2/query.go
@@ -1,10 +1,6 @@
 package api_v2
 
 import (
-	_ "github.com/gogo/googleapis/google/api"
-	_ "github.com/gogo/protobuf/gogoproto"
-	_ "github.com/gogo/protobuf/types"
-
 	modelv1 "github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
 )
 
@@ -57,8 +53,3 @@ type QueryService_GetTraceServer = modelv1.QueryService_GetTraceServer
 
 type QueryService_FindTracesServer = modelv1.QueryService_FindTracesServer
 
-var (
-	ErrInvalidLengthQuery        = modelv1.ErrInvalidLengthQuery
-	ErrIntOverflowQuery          = modelv1.ErrIntOverflowQuery
-	ErrUnexpectedEndOfGroupQuery = modelv1.ErrUnexpectedEndOfGroupQuery
-)
diff --git a/proto-gen/api_v2/sampling.go b/proto-gen/api_v2/sampling.go
index 79d7c7d5d68..db09468a1d8 100644
--- a/proto-gen/api_v2/sampling.go
+++ b/proto-gen/api_v2/sampling.go
@@ -1,8 +1,6 @@
 package api_v2
 
 import (
-	_ "github.com/gogo/googleapis/google/api"
-	_ "github.com/gogo/protobuf/gogoproto"
 	modelv1 "github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
 )
 
@@ -57,8 +55,3 @@ type UnimplementedSamplingManagerServer = modelv1.UnimplementedSamplingManagerSe
 
 var RegisterSamplingManagerServer = modelv1.RegisterSamplingManagerServer
 
-var (
-	ErrInvalidLengthSampling        = modelv1.ErrInvalidLengthSampling
-	ErrIntOverflowSampling          = modelv1.ErrIntOverflowSampling
-	ErrUnexpectedEndOfGroupSampling = modelv1.ErrUnexpectedEndOfGroupSampling
-)