diff --git a/cmd/drone-server/server.go b/cmd/drone-server/server.go
index 46bfaaa48..d2faa9a8d 100644
--- a/cmd/drone-server/server.go
+++ b/cmd/drone-server/server.go
@@ -18,8 +18,6 @@ import (
 	"github.com/cncd/logging"
 	"github.com/cncd/pipeline/pipeline/rpc/proto"
 	"github.com/cncd/pubsub"
-	"github.com/drone/drone/plugins/registry"
-	"github.com/drone/drone/plugins/secrets"
 	"github.com/drone/drone/plugins/sender"
 	"github.com/drone/drone/remote"
 	"github.com/drone/drone/router"
@@ -503,12 +501,6 @@ func setupEvilGlobals(c *cli.Context, v store.Store, r remote.Remote) {
 	droneserver.Config.Services.Senders = sender.New(v, v)
 	droneserver.Config.Services.Environ = setupEnvironService(c, v)
 
-	if endpoint := c.String("registry-service"); endpoint != "" {
-		droneserver.Config.Services.Registries = registry.NewRemote(endpoint)
-	}
-	if endpoint := c.String("secret-service"); endpoint != "" {
-		droneserver.Config.Services.Secrets = secrets.NewRemote(endpoint)
-	}
 	if endpoint := c.String("gating-service"); endpoint != "" {
 		droneserver.Config.Services.Senders = sender.NewRemote(endpoint)
 	}
diff --git a/plugins/registry/plugin.go b/plugins/registry/plugin.go
deleted file mode 100644
index a0dbf3693..000000000
--- a/plugins/registry/plugin.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package registry
-
-import (
-	"fmt"
-
-	"github.com/drone/drone/model"
-	"github.com/drone/drone/plugins/internal"
-)
-
-type plugin struct {
-	endpoint string
-}
-
-// NewRemote returns a new remote registry service.
-func NewRemote(endpoint string) model.RegistryService {
-	return &plugin{endpoint}
-}
-
-func (p *plugin) RegistryFind(repo *model.Repo, name string) (*model.Registry, error) {
-	path := fmt.Sprintf("%s/registry/%s/%s/%s", p.endpoint, repo.Owner, repo.Name, name)
-	out := new(model.Registry)
-	err := internal.Send("GET", path, nil, out)
-	return out, err
-}
-
-func (p *plugin) RegistryList(repo *model.Repo) ([]*model.Registry, error) {
-	path := fmt.Sprintf("%s/registry/%s/%s", p.endpoint, repo.Owner, repo.Name)
-	out := []*model.Registry{}
-	err := internal.Send("GET", path, nil, out)
-	return out, err
-}
-
-func (p *plugin) RegistryCreate(repo *model.Repo, in *model.Registry) error {
-	path := fmt.Sprintf("%s/registry/%s/%s", p.endpoint, repo.Owner, repo.Name)
-	return internal.Send("PATCH", path, in, nil)
-}
-
-func (p *plugin) RegistryUpdate(repo *model.Repo, in *model.Registry) error {
-	path := fmt.Sprintf("%s/registry/%s/%s/%s", p.endpoint, repo.Owner, repo.Name, in.Address)
-	return internal.Send("PATCH", path, in, nil)
-}
-
-func (p *plugin) RegistryDelete(repo *model.Repo, name string) error {
-	path := fmt.Sprintf("%s/registry/%s/%s/%s", p.endpoint, repo.Owner, repo.Name, name)
-	return internal.Send("DELETE", path, nil, nil)
-}
diff --git a/plugins/registry/plugin_test.go b/plugins/registry/plugin_test.go
deleted file mode 100644
index b2a276fb4..000000000
--- a/plugins/registry/plugin_test.go
+++ /dev/null
@@ -1 +0,0 @@
-package registry
diff --git a/plugins/secrets/plugin.go b/plugins/secrets/plugin.go
deleted file mode 100644
index 2525633d3..000000000
--- a/plugins/secrets/plugin.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package secrets
-
-import (
-	"fmt"
-
-	"github.com/drone/drone/model"
-	"github.com/drone/drone/plugins/internal"
-)
-
-type plugin struct {
-	endpoint string
-}
-
-// NewRemote returns a new remote secret service.
-func NewRemote(endpoint string) model.SecretService {
-	return &plugin{endpoint}
-}
-
-func (p *plugin) SecretFind(repo *model.Repo, name string) (*model.Secret, error) {
-	path := fmt.Sprintf("%s/secrets/%s/%s/%s", p.endpoint, repo.Owner, repo.Name, name)
-	out := new(model.Secret)
-	err := internal.Send("GET", path, nil, out)
-	return out, err
-}
-
-func (p *plugin) SecretList(repo *model.Repo) ([]*model.Secret, error) {
-	path := fmt.Sprintf("%s/secrets/%s/%s", p.endpoint, repo.Owner, repo.Name)
-	out := []*model.Secret{}
-	err := internal.Send("GET", path, nil, out)
-	return out, err
-}
-
-func (p *plugin) SecretListBuild(repo *model.Repo, build *model.Build) ([]*model.Secret, error) {
-	path := fmt.Sprintf("%s/secrets/%s/%s/%d", p.endpoint, repo.Owner, repo.Name, build.Number)
-	out := []*model.Secret{}
-	err := internal.Send("GET", path, nil, out)
-	return out, err
-}
-
-func (p *plugin) SecretCreate(repo *model.Repo, in *model.Secret) error {
-	path := fmt.Sprintf("%s/secrets/%s/%s", p.endpoint, repo.Owner, repo.Name)
-	return internal.Send("POST", path, in, nil)
-}
-
-func (p *plugin) SecretUpdate(repo *model.Repo, in *model.Secret) error {
-	path := fmt.Sprintf("%s/secrets/%s/%s/%s", p.endpoint, repo.Owner, repo.Name, in.Name)
-	return internal.Send("PATCH", path, in, nil)
-}
-
-func (p *plugin) SecretDelete(repo *model.Repo, name string) error {
-	path := fmt.Sprintf("%s/secrets/%s/%s/%s", p.endpoint, repo.Owner, repo.Name, name)
-	return internal.Send("DELETE", path, nil, nil)
-}
diff --git a/plugins/secrets/plugin_test.go b/plugins/secrets/plugin_test.go
deleted file mode 100644
index b2b97d555..000000000
--- a/plugins/secrets/plugin_test.go
+++ /dev/null
@@ -1 +0,0 @@
-package secrets
diff --git a/server/stream.go b/server/stream.go
index a40949c77..0d0761b0a 100644
--- a/server/stream.go
+++ b/server/stream.go
@@ -210,6 +210,7 @@ func EventStreamSSE(c *gin.Context) {
 	c.Header("Content-Type", "text/event-stream")
 	c.Header("Cache-Control", "no-cache")
 	c.Header("Connection", "keep-alive")
+	c.Header("X-Accel-Buffering", "no")
 
 	rw := c.Writer