diff --git a/handler.go b/handler.go
index 94b99bbe0..c8dda53c2 100644
--- a/handler.go
+++ b/handler.go
@@ -27,7 +27,6 @@ import (
 type Handler struct {
 	Index       *Index
 	Broadcaster Broadcaster
-	Server      *Server
 
 	// Local hostname & cluster configuration.
 	Host    string
diff --git a/server.go b/server.go
index 111e94ee7..229214805 100644
--- a/server.go
+++ b/server.go
@@ -67,7 +67,6 @@ func NewServer() *Server {
 	}
 
 	s.Handler.Index = s.Index
-	s.Handler.Server = s // TODO remove
 
 	return s
 }