diff --git a/server.go b/server.go
index 98a2dc16b..b1f0f3d10 100644
--- a/server.go
+++ b/server.go
@@ -211,15 +211,10 @@ func OptServerURI(uri *URI) ServerOption {
 
 // NewServer returns a new instance of Server.
 func NewServer(opts ...ServerOption) (*Server, error) {
-	//handler, err := NewNopHandler()
-	//if err != nil {
-	//	return nil, errors.Wrap(err, "initializing handler")
-	//}
 	s := &Server{
-		closing: make(chan struct{}),
-		Cluster: NewCluster(),
-		Holder:  NewHolder(),
-		//handler:           handler,
+		closing:           make(chan struct{}),
+		Cluster:           NewCluster(),
+		Holder:            NewHolder(),
 		Broadcaster:       NopBroadcaster,
 		BroadcastReceiver: NopBroadcastReceiver,
 		diagnostics:       NewDiagnosticsCollector(DefaultDiagnosticServer),