diff --git a/commands/pilosa-router/router.go b/commands/pilosa-router/router.go
deleted file mode 100644
index a9c040401..000000000
--- a/commands/pilosa-router/router.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package main
-
-import (
-	"pilosa/router"
-	"pilosa/db"
-	"flag"
-	"log"
-)
-
-var tcpLoc string
-var httpLoc string
-
-func init() {
-	flag.StringVar(&tcpLoc, "l", "127.0.0.1:1200", "ip:port to listen on")
-	flag.StringVar(&httpLoc, "h", "127.0.0.1:1400", "ip:port to listen on (http)")
-	flag.Parse()
-}
-
-func main() {
-	tcp, err := db.NewLocation(tcpLoc)
-	if err != nil {
-		log.Fatal("Location not valid:", tcpLoc)
-	}
-	http, err := db.NewLocation(httpLoc)
-	if err != nil {
-		log.Fatal("Location not valid:", httpLoc)
-	}
-
-	router := router.NewRouter(tcp, http)
-	router.Run()
-}
diff --git a/commands/pilosa-spawn/spawn.go b/commands/pilosa-spawn/spawn.go
deleted file mode 100644
index 670ee59ee..000000000
--- a/commands/pilosa-spawn/spawn.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package main
-
-import (
-	_ "circuit/load/cmd"
-	"circuit/use/circuit"
-	"pilosa/cruncher"
-	"log"
-)
-
-func main() {
-	log.Println("Spawning...")
-
-	retrn, addr, err := circuit.Spawn("localhost", []string{"/cruncher"}, cruncher.App{})
-	if err != nil {
-		log.Fatal(err)
-	}
-	log.Println(retrn, addr)
-
-	circuit.Hang()
-}
-
diff --git a/commands/pilosa-worker/worker.go b/commands/pilosa-worker/worker.go
deleted file mode 100644
index 946f5f869..000000000
--- a/commands/pilosa-worker/worker.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package main
-
-import (
-	_ "circuit/load/worker"
-	_ "pilosa/cruncher"
-)
-
-func main() {}
diff --git a/cruncher/cruncher.go b/cruncher/cruncher.go
index 8c93f79ed..309a22a48 100644
--- a/cruncher/cruncher.go
+++ b/cruncher/cruncher.go
@@ -4,8 +4,6 @@ import (
 	"pilosa/core"
 	"pilosa/db"
 	"log"
-	"circuit/use/circuit"
-	"time"
 )
 
 type Cruncher struct {
@@ -55,13 +53,3 @@ func (c *Cruncher) HandleInbox() {
 		}
 	}
 }
-
-type App struct{}
-func (App) Main() {
-	log.Println("Starting cruncher!")
-	time.Sleep(60*time.Second)
-}
-
-func init() {
-	circuit.RegisterFunc(App{})
-}