diff --git a/server.go b/server.go
index 2363b9de59..24d851c40a 100644
--- a/server.go
+++ b/server.go
@@ -549,7 +549,6 @@ type server struct {
 	modifyRebroadcastInv chan interface{}
 	peerState            peerState
 	banPeers             chan *serverPeer
-	query                chan interface{}
 	relayInv             chan relayMsg
 	broadcast            chan broadcastMsg
 	nat                  *upnpNAT
@@ -1928,11 +1927,6 @@ func (s *server) handleBroadcastMsg(state *peerState, bmsg *broadcastMsg) {
 	})
 }
 
-// handleQuery is the central handler for all queries and commands from other
-// goroutines related to peer state.
-func (s *server) handleQuery(ctx context.Context, state *peerState, querymsg interface{}) {
-}
-
 // disconnectPeer attempts to drop the connection of a targeted peer in the
 // passed peer list. Targets are identified via usage of the passed
 // `compareFunc`, which should return `true` if the passed peer is the target
@@ -2073,9 +2067,6 @@ out:
 		case bmsg := <-s.broadcast:
 			s.handleBroadcastMsg(&s.peerState, &bmsg)
 
-		case qmsg := <-s.query:
-			s.handleQuery(ctx, &s.peerState, qmsg)
-
 		case <-ctx.Done():
 			close(s.quit)
 
@@ -3519,7 +3510,6 @@ func newServer(ctx context.Context, listenAddrs []string, db database.DB,
 		addrManager:          amgr,
 		peerState:            makePeerState(),
 		banPeers:             make(chan *serverPeer, cfg.MaxPeers),
-		query:                make(chan interface{}),
 		relayInv:             make(chan relayMsg, cfg.MaxPeers),
 		broadcast:            make(chan broadcastMsg, cfg.MaxPeers),
 		modifyRebroadcastInv: make(chan interface{}),