diff --git a/pkg/cmd/grafana-server/server.go b/pkg/cmd/grafana-server/server.go
index 94eb8e845ea..af8f79e9eda 100644
--- a/pkg/cmd/grafana-server/server.go
+++ b/pkg/cmd/grafana-server/server.go
@@ -95,17 +95,3 @@ func (g *GrafanaServerImpl) Shutdown(code int, reason string) {
 	log.Close()
 	os.Exit(code)
 }
-
-// implement context.Context
-func (g *GrafanaServerImpl) Deadline() (deadline time.Time, ok bool) {
-	return g.context.Deadline()
-}
-func (g *GrafanaServerImpl) Done() <-chan struct{} {
-	return g.context.Done()
-}
-func (g *GrafanaServerImpl) Err() error {
-	return g.context.Err()
-}
-func (g *GrafanaServerImpl) Value(key interface{}) interface{} {
-	return g.context.Value(key)
-}
diff --git a/pkg/models/server.go b/pkg/models/server.go
index 876fc91dd01..4d683835256 100644
--- a/pkg/models/server.go
+++ b/pkg/models/server.go
@@ -1,10 +1,6 @@
 package models
 
-import "context"
-
 type GrafanaServer interface {
-	context.Context
-
 	Start()
 	Shutdown(code int, reason string)
 }