diff --git a/.drone.star b/.drone.star
index 53c12f7ae9..099b6d7cc4 100644
--- a/.drone.star
+++ b/.drone.star
@@ -62,10 +62,10 @@ def testing(ctx):
       },
       {
         'name': 'staticcheck',
-        'image': 'webhippie/golang:1.13',
+        'image': 'golangci/golangci-lint:latest',
         'pull': 'always',
         'commands': [
-          'make staticcheck',
+          'golangci-lint run',
         ],
         'volumes': [
           {
diff --git a/Makefile b/Makefile
index 2103cce62d..a11e8df28e 100644
--- a/Makefile
+++ b/Makefile
@@ -74,10 +74,6 @@ fmt:
 vet:
 	go vet $(PACKAGES)
 
-.PHONY: staticcheck
-staticcheck:
-	go run honnef.co/go/tools/cmd/staticcheck -tags '$(TAGS)' $(PACKAGES)
-
 .PHONY: lint
 lint:
 	for PKG in $(PACKAGES); do go run golang.org/x/lint/golint -set_exit_status $$PKG || exit 1; done;
diff --git a/pkg/command/server.go b/pkg/command/server.go
index bae74ebb6c..76b21d467e 100644
--- a/pkg/command/server.go
+++ b/pkg/command/server.go
@@ -33,9 +33,7 @@ func Server(cfg *config.Config) *cli.Command {
 			}
 
 			runtime := runtime.New()
-			runtime.Start()
-
-			return nil
+			return runtime.Start()
 		},
 	}
 }
diff --git a/pkg/micro/runtime/command.go b/pkg/micro/runtime/command.go
index ee0b7d9ff2..0125f048f4 100644
--- a/pkg/micro/runtime/command.go
+++ b/pkg/micro/runtime/command.go
@@ -12,9 +12,7 @@ func Command(app *cli.App) *cli.Command {
 		Category:    "Micro",
 		Action: func(c *cli.Context) error {
 			runtime := New()
-			runtime.Start()
-
-			return nil
+			return runtime.Start()
 		},
 	}
 	return &command
diff --git a/pkg/micro/runtime/options.go b/pkg/micro/runtime/options.go
index 5b7b2772a0..80754d76c3 100644
--- a/pkg/micro/runtime/options.go
+++ b/pkg/micro/runtime/options.go
@@ -15,17 +15,6 @@ type Options struct {
 // Option undocummented
 type Option func(o *Options)
 
-// newOptions initializes the available default options.
-func newOptions(opts ...Option) Options {
-	opt := Options{}
-
-	for _, o := range opts {
-		o(&opt)
-	}
-
-	return opt
-}
-
 // Services option
 func Services(s []string) Option {
 	return func(o *Options) {