diff --git a/Makefile b/Makefile
index a16c9e6..6ebb163 100644
--- a/Makefile
+++ b/Makefile
@@ -16,11 +16,6 @@ server:
 	go build -ldflags "-X main.version=${version}" ./cmd/ck-server
 	mv ck-server* ./build
 
-server_pprof: 
-	mkdir -p build
-	go build -ldflags "-X main.version=${version}" -tags pprof ./cmd/ck-server
-	mv ck-server* ./build
-
 install:
 	mv build/ck-* /usr/local/bin
 
diff --git a/cmd/ck-server/ck-server.go b/cmd/ck-server/ck-server.go
index 6aab9e9..cb88bbb 100644
--- a/cmd/ck-server/ck-server.go
+++ b/cmd/ck-server/ck-server.go
@@ -10,6 +10,7 @@ import (
 	"net"
 	"net/http"
 	"os"
+	"runtime"
 	"strings"
 	"time"
 
@@ -244,7 +245,12 @@ func main() {
 		}
 
 		if *pprofAddr != "" {
-			startPprof(*pprofAddr)
+			runtime.SetBlockProfileRate(5)
+			go func() {
+				log.Println(http.ListenAndServe(*pprofAddr, nil))
+			}()
+			log.Println("pprof listening on " + *pprofAddr)
+
 		}
 
 		log.Printf("Starting standalone mode, listening on %v:%v", bindHost, bindPort)
diff --git a/cmd/ck-server/pprof.go b/cmd/ck-server/pprof.go
deleted file mode 100644
index 2e0b7ee..0000000
--- a/cmd/ck-server/pprof.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build !pprof
-
-package main
-
-import "log"
-
-func startPprof(x string) {
-	log.Println("pprof not available in release builds to reduce binary size")
-}
diff --git a/cmd/ck-server/pprof_debug.go b/cmd/ck-server/pprof_debug.go
deleted file mode 100644
index 90b0356..0000000
--- a/cmd/ck-server/pprof_debug.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// +build pprof
-
-package main
-
-import (
-	"log"
-	"net/http"
-	_ "net/http/pprof"
-	"runtime"
-)
-
-func startPprof(pprofAddr string) {
-	runtime.SetBlockProfileRate(5)
-	go func() {
-		log.Println(http.ListenAndServe(pprofAddr, nil))
-	}()
-	log.Println("pprof listening on " + pprofAddr)
-}