diff --git a/agent/secret.go b/agent/secret.go
diff --git a/agent/secret_test.go b/agent/secret_test.go
diff --git a/agent/updater.go b/agent/updater.go
diff --git a/build/config.go b/build/config.go
diff --git a/build/docker/docker.go b/build/docker/docker.go
diff --git a/build/docker/docker_test.go b/build/docker/docker_test.go
diff --git a/build/docker/helper.go b/build/docker/helper.go
diff --git a/build/docker/helper_test.go b/build/docker/helper_test.go
diff --git a/build/docker/internal/README b/build/docker/internal/README
diff --git a/build/docker/internal/stdcopy.go b/build/docker/internal/stdcopy.go
diff --git a/build/docker/internal/stdcopy_test.go b/build/docker/internal/stdcopy_test.go
diff --git a/build/docker/util.go b/build/docker/util.go
diff --git a/build/docker/util_test.go b/build/docker/util_test.go
diff --git a/build/engine.go b/build/engine.go
diff --git a/build/error.go b/build/error.go
diff --git a/build/error_test.go b/build/error_test.go
diff --git a/build/pipeline.go b/build/pipeline.go
diff --git a/build/pipeline_test.go b/build/pipeline_test.go
diff --git a/build/types.go b/build/types.go
diff --git a/build/types_test.go b/build/types_test.go
diff --git a/drone/agent/agent.go b/drone/agent/agent.go
diff --git a/drone/agent/exec.go b/drone/agent/exec.go
diff --git a/drone/agent/exp.go b/drone/agent/exp.go
diff --git a/drone/agent_list.go b/drone/agent_list.go
diff --git a/drone/build.go b/drone/build.go
@@ -1,6 +1,6 @@
 package main
 
-import "github.com/codegangsta/cli"
+import "github.com/urfave/cli"
 
 var buildCmd = cli.Command{
 	Name:  "build",

diff --git a/drone/build_info.go b/drone/build_info.go
@@ -1,22 +1,17 @@
 package main
 
 import (
-	"log"
 	"os"
 	"strconv"
 	"text/template"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 var buildInfoCmd = cli.Command{
-	Name:  "info",
-	Usage: "show build details",
-	Action: func(c *cli.Context) {
-		if err := buildInfo(c); err != nil {
-			log.Fatalln(err)
-		}
-	},
+	Name:   "info",
+	Usage:  "show build details",
+	Action: buildInfo,
 	Flags: []cli.Flag{
 		cli.StringFlag{
 			Name:  "format",

diff --git a/drone/build_last.go b/drone/build_last.go
@@ -1,21 +1,16 @@
 package main
 
 import (
-	"log"
 	"os"
 	"text/template"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 var buildLastCmd = cli.Command{
-	Name:  "last",
-	Usage: "show latest build details",
-	Action: func(c *cli.Context) {
-		if err := buildLast(c); err != nil {
-			log.Fatalln(err)
-		}
-	},
+	Name:   "last",
+	Usage:  "show latest build details",
+	Action: buildLast,
 	Flags: []cli.Flag{
 		cli.StringFlag{
 			Name:  "format",

diff --git a/drone/build_list.go b/drone/build_list.go
@@ -1,21 +1,16 @@
 package main
 
 import (
-	"log"
 	"os"
 	"text/template"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 var buildListCmd = cli.Command{
-	Name:  "list",
-	Usage: "show build history",
-	Action: func(c *cli.Context) {
-		if err := buildList(c); err != nil {
-			log.Fatalln(err)
-		}
-	},
+	Name:   "list",
+	Usage:  "show build history",
+	Action: buildList,
 	Flags: []cli.Flag{
 		cli.StringFlag{
 			Name:  "format",

diff --git a/drone/build_logs.go b/drone/build_logs.go
@@ -6,8 +6,8 @@ import (
 	"log"
 	"strconv"
 
-	"github.com/codegangsta/cli"
-	"github.com/drone/drone/build"
+	"github.com/cncd/pipeline/pipeline/rpc"
+	"github.com/urfave/cli"
 )
 
 var buildLogsCmd = cli.Command{
@@ -61,7 +61,7 @@ func buildLogs(c *cli.Context) error {
 
 	dec := json.NewDecoder(r)
 	fmt.Printf("Logs for build %s/%s#%d.%d\n", owner, name, number, job)
-	var line build.Line
+	var line rpc.Line
 
 	_, err = dec.Token()
 	if err != nil {

diff --git a/drone/build_queue.go b/drone/build_queue.go
@@ -2,21 +2,16 @@ package main
 
 import (
 	"fmt"
-	"log"
 	"os"
 	"text/template"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 var buildQueueCmd = cli.Command{
-	Name:  "queue",
-	Usage: "show build queue",
-	Action: func(c *cli.Context) {
-		if err := buildQueue(c); err != nil {
-			log.Fatalln(err)
-		}
-	},
+	Name:   "queue",
+	Usage:  "show build queue",
+	Action: buildQueue,
 	Flags: []cli.Flag{
 		cli.StringFlag{
 			Name:  "format",

diff --git a/drone/build_start.go b/drone/build_start.go
@@ -2,21 +2,16 @@ package main
 
 import (
 	"fmt"
-	"log"
 	"strconv"
 
-	"github.com/codegangsta/cli"
 	"github.com/drone/drone/model"
+	"github.com/urfave/cli"
 )
 
 var buildStartCmd = cli.Command{
-	Name:  "start",
-	Usage: "start a build",
-	Action: func(c *cli.Context) {
-		if err := buildStart(c); err != nil {
-			log.Fatalln(err)
-		}
-	},
+	Name:   "start",
+	Usage:  "start a build",
+	Action: buildStart,
 	Flags: []cli.Flag{
 		cli.BoolFlag{
 			Name:  "fork",

diff --git a/drone/build_stop.go b/drone/build_stop.go
@@ -2,20 +2,15 @@ package main
 
 import (
 	"fmt"
-	"log"
 	"strconv"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 var buildStopCmd = cli.Command{
-	Name:  "stop",
-	Usage: "stop a build",
-	Action: func(c *cli.Context) {
-		if err := buildStop(c); err != nil {
-			log.Fatalln(err)
-		}
-	},
+	Name:   "stop",
+	Usage:  "stop a build",
+	Action: buildStop,
 }
 
 func buildStop(c *cli.Context) (err error) {

diff --git a/drone/compile.go b/drone/compile.go
diff --git a/drone/deploy.go b/drone/deploy.go
@@ -3,22 +3,17 @@ package main
 import (
 	"fmt"
 	"html/template"
-	"log"
 	"os"
 	"strconv"
 
-	"github.com/codegangsta/cli"
 	"github.com/drone/drone/model"
+	"github.com/urfave/cli"
 )
 
 var deployCmd = cli.Command{
-	Name:  "deploy",
-	Usage: "deploy code",
-	Action: func(c *cli.Context) {
-		if err := deploy(c); err != nil {
-			log.Fatalln(err)
-		}
-	},
+	Name:   "deploy",
+	Usage:  "deploy code",
+	Action: deploy,
 	Flags: []cli.Flag{
 		cli.StringFlag{
 			Name:  "format",

diff --git a/drone/exec.go b/drone/exec.go
diff --git a/drone/global.go b/drone/global.go
@@ -1,6 +1,6 @@
 package main
 
-import "github.com/codegangsta/cli"
+import "github.com/urfave/cli"
 
 var globalCmd = cli.Command{
 	Name:  "global",

diff --git a/drone/global_secret.go b/drone/global_secret.go
@@ -1,6 +1,6 @@
 package main
 
-import "github.com/codegangsta/cli"
+import "github.com/urfave/cli"
 
 var globalSecretCmd = cli.Command{
 	Name:  "secret",

diff --git a/drone/global_secret_add.go b/drone/global_secret_add.go
@@ -1,21 +1,13 @@
 package main
 
-import (
-	"log"
-
-	"github.com/codegangsta/cli"
-)
+import "github.com/urfave/cli"
 
 var globalSecretAddCmd = cli.Command{
 	Name:      "add",
 	Usage:     "adds a secret",
 	ArgsUsage: "[key] [value]",
-	Action: func(c *cli.Context) {
-		if err := globalSecretAdd(c); err != nil {
-			log.Fatalln(err)
-		}
-	},
-	Flags: secretAddFlags(),
+	Action:    globalSecretAdd,
+	Flags:     secretAddFlags(),
 }
 
 func globalSecretAdd(c *cli.Context) error {

diff --git a/drone/global_secret_list.go b/drone/global_secret_list.go
@@ -1,20 +1,12 @@
 package main
 
-import (
-	"log"
-
-	"github.com/codegangsta/cli"
-)
+import "github.com/urfave/cli"
 
 var globalSecretListCmd = cli.Command{
-	Name:  "ls",
-	Usage: "list all secrets",
-	Action: func(c *cli.Context) {
-		if err := globalSecretList(c); err != nil {
-			log.Fatalln(err)
-		}
-	},
-	Flags: secretListFlags(),
+	Name:   "ls",
+	Usage:  "list all secrets",
+	Action: globalSecretList,
+	Flags:  secretListFlags(),
 }
 
 func globalSecretList(c *cli.Context) error {

diff --git a/drone/global_secret_rm.go b/drone/global_secret_rm.go
@@ -1,19 +1,11 @@
 package main
 
-import (
-	"log"
-
-	"github.com/codegangsta/cli"
-)
+import "github.com/urfave/cli"
 
 var globalSecretRemoveCmd = cli.Command{
-	Name:  "rm",
-	Usage: "remove a secret",
-	Action: func(c *cli.Context) {
-		if err := globalSecretRemove(c); err != nil {
-			log.Fatalln(err)
-		}
-	},
+	Name:   "rm",
+	Usage:  "remove a secret",
+	Action: globalSecretRemove,
 }
 
 func globalSecretRemove(c *cli.Context) error {

diff --git a/drone/info.go b/drone/info.go
@@ -1,21 +1,16 @@
 package main
 
 import (
-	"log"
 	"os"
 	"text/template"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 var infoCmd = cli.Command{
-	Name:  "info",
-	Usage: "show information about the current user",
-	Action: func(c *cli.Context) {
-		if err := info(c); err != nil {
-			log.Fatalln(err)
-		}
-	},
+	Name:   "info",
+	Usage:  "show information about the current user",
+	Action: info,
 	Flags: []cli.Flag{
 		cli.StringFlag{
 			Name:  "format",

diff --git a/drone/main.go b/drone/main.go
@@ -1,14 +1,15 @@
 package main
 
 import (
+	"fmt"
 	"os"
 
 	"github.com/drone/drone/drone/agent"
 	"github.com/drone/drone/version"
 
-	"github.com/codegangsta/cli"
 	"github.com/ianschenck/envflag"
 	_ "github.com/joho/godotenv/autoload"
+	"github.com/urfave/cli"
 )
 
 func main() {
@@ -32,7 +33,6 @@ func main() {
 	}
 	app.Commands = []cli.Command{
 		agent.AgentCmd,
-		agentsCmd,
 		buildCmd,
 		deployCmd,
 		execCmd,
@@ -46,5 +46,8 @@ func main() {
 		globalCmd,
 	}
 
-	app.Run(os.Args)
+	if err := app.Run(os.Args); err != nil {
+		fmt.Fprintln(os.Stderr, err)
+		os.Exit(1)
+	}
 }
diff --git a/drone/org.go b/drone/org.go
@@ -1,6 +1,6 @@
 package main
 
-import "github.com/codegangsta/cli"
+import "github.com/urfave/cli"
 
 var orgCmd = cli.Command{
 	Name:  "org",

diff --git a/drone/org_secret.go b/drone/org_secret.go
@@ -1,6 +1,6 @@
 package main
 
-import "github.com/codegangsta/cli"
+import "github.com/urfave/cli"
 
 var orgSecretCmd = cli.Command{
 	Name:  "secret",

diff --git a/drone/org_secret_add.go b/drone/org_secret_add.go
@@ -1,21 +1,13 @@
 package main
 
-import (
-	"log"
-
-	"github.com/codegangsta/cli"
-)
+import "github.com/urfave/cli"
 
 var orgSecretAddCmd = cli.Command{
 	Name:      "add",
 	Usage:     "adds a secret",
 	ArgsUsage: "[org] [key] [value]",
-	Action: func(c *cli.Context) {
-		if err := orgSecretAdd(c); err != nil {
-			log.Fatalln(err)
-		}
-	},
-	Flags: secretAddFlags(),
+	Action:    orgSecretAdd,
+	Flags:     secretAddFlags(),
 }
 
 func orgSecretAdd(c *cli.Context) error {

diff --git a/drone/org_secret_list.go b/drone/org_secret_list.go
@@ -1,20 +1,12 @@
 package main
 
-import (
-	"log"
-
-	"github.com/codegangsta/cli"
-)
+import "github.com/urfave/cli"
 
 var orgSecretListCmd = cli.Command{
-	Name:  "ls",
-	Usage: "list all secrets",
-	Action: func(c *cli.Context) {
-		if err := orgSecretList(c); err != nil {
-			log.Fatalln(err)
-		}
-	},
-	Flags: secretListFlags(),
+	Name:   "ls",
+	Usage:  "list all secrets",
+	Action: orgSecretList,
+	Flags:  secretListFlags(),
 }
 
 func orgSecretList(c *cli.Context) error {

diff --git a/drone/org_secret_rm.go b/drone/org_secret_rm.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 var orgSecretRemoveCmd = cli.Command{

diff --git a/drone/repo.go b/drone/repo.go
@@ -1,6 +1,6 @@
 package main
 
-import "github.com/codegangsta/cli"
+import "github.com/urfave/cli"
 
 var repoCmd = cli.Command{
 	Name:  "repo",

diff --git a/drone/repo_add.go b/drone/repo_add.go
@@ -2,19 +2,14 @@ package main
 
 import (
 	"fmt"
-	"log"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 var repoAddCmd = cli.Command{
-	Name:  "add",
-	Usage: "add a repository",
-	Action: func(c *cli.Context) {
-		if err := repoAdd(c); err != nil {
-			log.Fatalln(err)
-		}
-	},
+	Name:   "add",
+	Usage:  "add a repository",
+	Action: repoAdd,
 }
 
 func repoAdd(c *cli.Context) error {

diff --git a/drone/repo_chown.go b/drone/repo_chown.go
@@ -2,19 +2,14 @@ package main
 
 import (
 	"fmt"
-	"log"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 var repoChownCmd = cli.Command{
-	Name:  "chown",
-	Usage: "assume ownership of a repository",
-	Action: func(c *cli.Context) {
-		if err := repoChown(c); err != nil {
-			log.Fatalln(err)
-		}
-	},
+	Name:   "chown",
+	Usage:  "assume ownership of a repository",
+	Action: repoChown,
 }
 
 func repoChown(c *cli.Context) error {

diff --git a/drone/repo_info.go b/drone/repo_info.go
@@ -1,21 +1,16 @@
 package main
 
 import (
-	"log"
 	"os"
 	"text/template"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 var repoInfoCmd = cli.Command{
-	Name:  "info",
-	Usage: "show repository details",
-	Action: func(c *cli.Context) {
-		if err := repoInfo(c); err != nil {
-			log.Fatalln(err)
-		}
-	},
+	Name:   "info",
+	Usage:  "show repository details",
+	Action: repoInfo,
 	Flags: []cli.Flag{
 		cli.StringFlag{
 			Name:  "format",

diff --git a/drone/repo_list.go b/drone/repo_list.go
@@ -1,21 +1,16 @@
 package main
 
 import (
-	"log"
 	"os"
 	"text/template"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 var repoListCmd = cli.Command{
-	Name:  "ls",
-	Usage: "list all repos",
-	Action: func(c *cli.Context) {
-		if err := repoList(c); err != nil {
-			log.Fatalln(err)
-		}
-	},
+	Name:   "ls",
+	Usage:  "list all repos",
+	Action: repoList,
 	Flags: []cli.Flag{
 		cli.StringFlag{
 			Name:  "format",

diff --git a/drone/repo_rm.go b/drone/repo_rm.go
@@ -2,19 +2,14 @@ package main
 
 import (
 	"fmt"
-	"log"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 var repoRemoveCmd = cli.Command{
-	Name:  "rm",
-	Usage: "remove a repository",
-	Action: func(c *cli.Context) {
-		if err := repoRemove(c); err != nil {
-			log.Fatalln(err)
-		}
-	},
+	Name:   "rm",
+	Usage:  "remove a repository",
+	Action: repoRemove,
 }
 
 func repoRemove(c *cli.Context) error {

diff --git a/drone/secret.go b/drone/secret.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/codegangsta/cli"
 	"github.com/drone/drone/model"
+	"github.com/urfave/cli"
 )
 
 var secretCmd = cli.Command{

diff --git a/drone/secret_add.go b/drone/secret_add.go
@@ -1,21 +1,13 @@
 package main
 
-import (
-	"log"
-
-	"github.com/codegangsta/cli"
-)
+import "github.com/urfave/cli"
 
 var secretAddCmd = cli.Command{
 	Name:      "add",
 	Usage:     "adds a secret",
 	ArgsUsage: "[repo] [key] [value]",
-	Action: func(c *cli.Context) {
-		if err := secretAdd(c); err != nil {
-			log.Fatalln(err)
-		}
-	},
-	Flags: secretAddFlags(),
+	Action:    secretAdd,
+	Flags:     secretAddFlags(),
 }
 
 func secretAdd(c *cli.Context) error {

diff --git a/drone/secret_list.go b/drone/secret_list.go
@@ -1,20 +1,12 @@
 package main
 
-import (
-	"log"
-
-	"github.com/codegangsta/cli"
-)
+import "github.com/urfave/cli"
 
 var secretListCmd = cli.Command{
-	Name:  "ls",
-	Usage: "list all secrets",
-	Action: func(c *cli.Context) {
-		if err := secretList(c); err != nil {
-			log.Fatalln(err)
-		}
-	},
-	Flags: secretListFlags(),
+	Name:   "ls",
+	Usage:  "list all secrets",
+	Action: secretList,
+	Flags:  secretListFlags(),
 }
 
 func secretList(c *cli.Context) error {

diff --git a/drone/secret_rm.go b/drone/secret_rm.go
@@ -1,19 +1,11 @@
 package main
 
-import (
-	"log"
-
-	"github.com/codegangsta/cli"
-)
+import "github.com/urfave/cli"
 
 var secretRemoveCmd = cli.Command{
-	Name:  "rm",
-	Usage: "remove a secret",
-	Action: func(c *cli.Context) {
-		if err := secretRemove(c); err != nil {
-			log.Fatalln(err)
-		}
-	},
+	Name:   "rm",
+	Usage:  "remove a secret",
+	Action: secretRemove,
 }
 
 func secretRemove(c *cli.Context) error {

diff --git a/drone/server.go b/drone/server.go
@@ -8,18 +8,14 @@ import (
 	"github.com/drone/drone/router/middleware"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/codegangsta/cli"
 	"github.com/gin-gonic/contrib/ginrus"
+	"github.com/urfave/cli"
 )
 
 var serverCmd = cli.Command{
-	Name:  "server",
-	Usage: "starts the drone server daemon",
-	Action: func(c *cli.Context) {
-		if err := server(c); err != nil {
-			logrus.Fatal(err)
-		}
-	},
+	Name:   "server",
+	Usage:  "starts the drone server daemon",
+	Action: server,
 	Flags: []cli.Flag{
 		cli.BoolFlag{
 			EnvVar: "DRONE_DEBUG",
@@ -301,8 +297,6 @@ func server(c *cli.Context) error {
 		middleware.Cache(c),
 		middleware.Store(c),
 		middleware.Remote(c),
-		middleware.Agents(c),
-		middleware.Broker(c),
 	)
 
 	// start the server with tls enabled

diff --git a/drone/sign.go b/drone/sign.go
@@ -2,19 +2,14 @@ package main
 
 import (
 	"io/ioutil"
-	"log"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 var signCmd = cli.Command{
-	Name:  "sign",
-	Usage: "creates a secure yaml file",
-	Action: func(c *cli.Context) {
-		if err := sign(c); err != nil {
-			log.Fatalln(err)
-		}
-	},
+	Name:   "sign",
+	Usage:  "creates a secure yaml file",
+	Action: sign,
 	Flags: []cli.Flag{
 		cli.StringFlag{
 			Name:  "in",

diff --git a/drone/user.go b/drone/user.go
@@ -1,6 +1,6 @@
 package main
 
-import "github.com/codegangsta/cli"
+import "github.com/urfave/cli"
 
 var userCmd = cli.Command{
 	Name:  "user",

diff --git a/drone/user_add.go b/drone/user_add.go
@@ -2,20 +2,15 @@ package main
 
 import (
 	"fmt"
-	"log"
 
-	"github.com/codegangsta/cli"
 	"github.com/drone/drone/model"
+	"github.com/urfave/cli"
 )
 
 var userAddCmd = cli.Command{
-	Name:  "add",
-	Usage: "adds a user",
-	Action: func(c *cli.Context) {
-		if err := userAdd(c); err != nil {
-			log.Fatalln(err)
-		}
-	},
+	Name:   "add",
+	Usage:  "adds a user",
+	Action: userAdd,
 }
 
 func userAdd(c *cli.Context) error {

diff --git a/drone/user_info.go b/drone/user_info.go
@@ -2,21 +2,16 @@ package main
 
 import (
 	"fmt"
-	"log"
 	"os"
 	"text/template"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 var userInfoCmd = cli.Command{
-	Name:  "info",
-	Usage: "show user details",
-	Action: func(c *cli.Context) {
-		if err := userInfo(c); err != nil {
-			log.Fatalln(err)
-		}
-	},
+	Name:   "info",
+	Usage:  "show user details",
+	Action: userInfo,
 	Flags: []cli.Flag{
 		cli.StringFlag{
 			Name:  "format",

diff --git a/drone/user_list.go b/drone/user_list.go
@@ -1,21 +1,16 @@
 package main
 
 import (
-	"log"
 	"os"
 	"text/template"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 var userListCmd = cli.Command{
-	Name:  "ls",
-	Usage: "list all users",
-	Action: func(c *cli.Context) {
-		if err := userList(c); err != nil {
-			log.Fatalln(err)
-		}
-	},
+	Name:   "ls",
+	Usage:  "list all users",
+	Action: userList,
 	Flags: []cli.Flag{
 		cli.StringFlag{
 			Name:  "format",

diff --git a/drone/user_rm.go b/drone/user_rm.go
@@ -2,19 +2,14 @@ package main
 
 import (
 	"fmt"
-	"log"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 var userRemoveCmd = cli.Command{
-	Name:  "rm",
-	Usage: "remove a user",
-	Action: func(c *cli.Context) {
-		if err := userRemove(c); err != nil {
-			log.Fatalln(err)
-		}
-	},
+	Name:   "rm",
+	Usage:  "remove a user",
+	Action: userRemove,
 }
 
 func userRemove(c *cli.Context) error {

diff --git a/drone/util.go b/drone/util.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/drone/drone/client"
 
-	"github.com/codegangsta/cli"
 	"github.com/jackspirou/syscerts"
+	"github.com/urfave/cli"
 )
 
 func newClient(c *cli.Context) (client.Client, error) {

diff --git a/router/middleware/agent.go b/router/middleware/agent.go
diff --git a/router/middleware/broker.go b/router/middleware/broker.go
diff --git a/router/middleware/cache.go b/router/middleware/cache.go
@@ -3,8 +3,8 @@ package middleware
 import (
 	"github.com/drone/drone/cache"
 
-	"github.com/codegangsta/cli"
 	"github.com/gin-gonic/gin"
+	"github.com/urfave/cli"
 )
 
 // Cache is a middleware function that initializes the Cache and attaches to

diff --git a/router/middleware/config.go b/router/middleware/config.go
@@ -3,8 +3,8 @@ package middleware
 import (
 	"github.com/drone/drone/model"
 
-	"github.com/codegangsta/cli"
 	"github.com/gin-gonic/gin"
+	"github.com/urfave/cli"
 )
 
 const configKey = "config"

diff --git a/router/middleware/remote.go b/router/middleware/remote.go
@@ -4,14 +4,14 @@ import (
 	"fmt"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/codegangsta/cli"
 	"github.com/drone/drone/remote"
 	"github.com/drone/drone/remote/bitbucket"
 	"github.com/drone/drone/remote/bitbucketserver"
 	"github.com/drone/drone/remote/github"
 	"github.com/drone/drone/remote/gitlab"
 	"github.com/drone/drone/remote/gogs"
 	"github.com/gin-gonic/gin"
+	"github.com/urfave/cli"
 )
 
 // Remote is a middleware function that initializes the Remote and attaches to

diff --git a/router/middleware/store.go b/router/middleware/store.go
@@ -1,9 +1,9 @@
 package middleware
 
 import (
-	"github.com/codegangsta/cli"
 	"github.com/drone/drone/store"
 	"github.com/drone/drone/store/datastore"
+	"github.com/urfave/cli"
 
 	"github.com/gin-gonic/gin"
 )

diff --git a/router/router.go b/router/router.go
@@ -2,7 +2,6 @@ package router
 
 import (
 	"net/http"
-	"os"
 
 	"github.com/gin-gonic/gin"
 
@@ -41,8 +40,6 @@ func Load(middleware ...gin.HandlerFunc) http.Handler {
 	e.GET("/logout", server.GetLogout)
 	e.NoRoute(server.ShowIndex)
 
-	// TODO above will Go away with React UI
-
 	user := e.Group("/api/user")
 	{
 		user.Use(session.MustUser())
@@ -121,46 +118,28 @@ func Load(middleware ...gin.HandlerFunc) http.Handler {
 		badges.GET("/cc.xml", server.GetCC)
 	}
 
-	if os.Getenv("DRONE_CANARY") == "" {
-		e.POST("/hook", server.PostHook)
-		e.POST("/api/hook", server.PostHook)
-	} else {
-		e.POST("/hook", server.PostHook2)
-		e.POST("/api/hook", server.PostHook2)
+	e.POST("/hook", server.PostHook)
+	e.POST("/api/hook", server.PostHook)
+
+	ws := e.Group("/ws")
+	{
+		ws.GET("/broker", server.RPCHandler)
+		ws.GET("/rpc", server.RPCHandler)
+		ws.GET("/feed", server.EventStream)
+		ws.GET("/logs/:owner/:name/:build/:number",
+			session.SetRepo(),
+			session.SetPerm(),
+			session.MustPull,
+			server.LogStream,
+		)
 	}
 
-	if os.Getenv("DRONE_CANARY") == "" {
-		ws := e.Group("/ws")
-		{
-			ws.GET("/broker", server.Broker)
-			ws.GET("/feed", server.EventStream)
-			ws.GET("/logs/:owner/:name/:build/:number",
-				session.SetRepo(),
-				session.SetPerm(),
-				session.MustPull,
-				server.LogStream,
-			)
-		}
-	} else {
-		ws := e.Group("/ws")
-		{
-			ws.GET("/broker", server.RPCHandler)
-			ws.GET("/rpc", server.RPCHandler)
-			ws.GET("/feed", server.EventStream2)
-			ws.GET("/logs/:owner/:name/:build/:number",
-				session.SetRepo(),
-				session.SetPerm(),
-				session.MustPull,
-				server.LogStream2,
-			)
-		}
-		info := e.Group("/api/info")
-		{
-			info.GET("/queue",
-				session.MustAdmin(),
-				server.GetQueueInfo,
-			)
-		}
+	info := e.Group("/api/info")
+	{
+		info.GET("/queue",
+			session.MustAdmin(),
+			server.GetQueueInfo,
+		)
 	}
 
 	auth := e.Group("/authorize")
@@ -191,12 +170,5 @@ func Load(middleware ...gin.HandlerFunc) http.Handler {
 		debugger.GET("/pprof/trace", debug.TraceHandler())
 	}
 
-	// bots := e.Group("/bots")
-	// {
-	// 	bots.Use(session.MustUser())
-	// 	bots.POST("/slack", Slack)
-	// 	bots.POST("/slack/:command", Slack)
-	// }
-
 	return e
 }