diff --git a/dkron/queries.go b/dkron/queries.go
deleted file mode 100644
index 64ae37fc3..000000000
--- a/dkron/queries.go
+++ /dev/null
@@ -1,157 +0,0 @@
-package dkron
-
-import (
-	"encoding/json"
-	"fmt"
-	"time"
-
-	"github.com/hashicorp/serf/serf"
-	"github.com/sirupsen/logrus"
-)
-
-const (
-	// QueryRunJob define a run job query string
-	QueryRunJob = "run:job"
-	// QueryExecutionDone define the execution done query string
-	QueryExecutionDone = "execution:done"
-)
-
-// RunQueryParam defines the struct used to send a Run query
-// using serf.
-type RunQueryParam struct {
-	Execution *Execution `json:"execution"`
-	RPCAddr   string     `json:"rpc_addr"`
-}
-
-// RunQuery sends a serf run query to the cluster, this is used to ask a node or nodes
-// to run a Job. Returns a job with it's new status and next schedule.
-func (a *Agent) RunQuery(jobName string, ex *Execution) (*Job, error) {
-	start := time.Now()
-	var params *serf.QueryParam
-
-	job, err := a.Store.GetJob(jobName, nil)
-	if err != nil {
-		return nil, fmt.Errorf("agent: RunQuery error retrieving job: %s from store: %w", jobName, err)
-	}
-
-	// In case the job is not a child job, compute the next execution time
-	if job.ParentJob == "" {
-		if e, ok := a.sched.GetEntry(jobName); ok {
-			job.Next = e.Next
-			if err := a.applySetJob(job.ToProto()); err != nil {
-				return nil, fmt.Errorf("agent: RunQuery error storing job %s before running: %w", jobName, err)
-			}
-		} else {
-			return nil, fmt.Errorf("agent: RunQuery error retrieving job: %s from scheduler", jobName)
-		}
-	}
-
-	// In the first execution attempt we build and filter the target nodes
-	// but we use the existing node target in case of retry.
-	filterMap := map[string]string{}
-	if ex.Attempt <= 1 {
-		filterMap, _, err = a.processFilteredNodes(job)
-		if err != nil {
-			return nil, fmt.Errorf("agent: RunQuery error processing filtered nodes: %w", err)
-		}
-
-		// for _, n := range fn {
-		// 	filterMap[n] = true
-		// }
-		// log.Debug("agent: Filtered tags to run: ", filterTags)
-
-		//serf match regexp but we want only match full tag
-		// serfFilterTags := make(map[string]string)
-		// for key, val := range filterTags {
-		// 	b := new(bytes.Buffer)
-		// 	b.WriteString("^")
-		// 	b.WriteString(val)
-		// 	b.WriteString("$")
-		// 	serfFilterTags[key] = b.String()
-		// }
-
-		// params = &serf.QueryParam{
-		// 	FilterNodes: filterNodes,
-		// 	// FilterTags:  serfFilterTags,
-		// 	RequestAck: true,
-		// }
-	} else {
-		filterMap = map[string]string{ex.NodeName: ""}
-	}
-
-	retry := 0
-
-	rqp := &RunQueryParam{
-		Execution: ex,
-		RPCAddr:   a.getRPCAddr(),
-	}
-	rqpJSON, _ := json.Marshal(rqp)
-
-Retry:
-	var filterNodes []string
-	for k := range filterMap {
-		filterNodes = append(filterNodes, k)
-	}
-	log.Debug("agent: Filtered nodes to run: ", filterNodes)
-
-	params = &serf.QueryParam{
-		FilterNodes: filterNodes,
-		RequestAck:  true,
-	}
-
-	log.WithFields(logrus.Fields{
-		"query":    QueryRunJob,
-		"job_name": job.Name,
-	}).Info("agent: Sending query")
-
-	log.WithFields(logrus.Fields{
-		"query":    QueryRunJob,
-		"job_name": job.Name,
-		"json":     string(rqpJSON),
-	}).Debug("agent: Sending query")
-
-	qr, err := a.serf.Query(QueryRunJob, rqpJSON, params)
-	if err != nil {
-		return nil, fmt.Errorf("agent: RunQuery sending query error: %w", err)
-	}
-	defer qr.Close()
-
-	ackCh := qr.AckCh()
-	respCh := qr.ResponseCh()
-
-	for !qr.Finished() {
-		select {
-		case ack, ok := <-ackCh:
-			if ok {
-				log.WithFields(logrus.Fields{
-					"query": QueryRunJob,
-					"from":  ack,
-				}).Debug("agent: Received ack")
-			}
-			delete(filterMap, ack)
-		case resp, ok := <-respCh:
-			if ok {
-				log.WithFields(logrus.Fields{
-					"query":    QueryRunJob,
-					"from":     resp.From,
-					"response": string(resp.Payload),
-				}).Debug("agent: Received response")
-			}
-		}
-	}
-	log.WithFields(logrus.Fields{
-		"time":  time.Since(start),
-		"query": QueryRunJob,
-	}).Debug("agent: Done receiving acks and responses")
-
-	if len(filterMap) > 0 {
-		if retry < 10 {
-			retry++
-			log.WithField("nodes", filterMap).Error("agent: error trying to run job in nodes, retrying")
-			goto Retry
-		}
-		log.WithField("nodes", filterMap).Error("agent: error trying to run job in nodes after 10 retries, giving up")
-	}
-
-	return job, nil
-}
diff --git a/dkron/queries_test.go b/dkron/queries_test.go
deleted file mode 100644
index 96bcd6fbd..000000000
--- a/dkron/queries_test.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package dkron
-
-import (
-	"errors"
-	"io/ioutil"
-	"os"
-	"testing"
-	"time"
-
-	"github.com/hashicorp/serf/testutil"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"github.com/tidwall/buntdb"
-)
-
-func TestRunQuery(t *testing.T) {
-	dir, err := ioutil.TempDir("", "dkron-test")
-	require.NoError(t, err)
-	defer os.RemoveAll(dir)
-
-	ip1, returnFn1 := testutil.TakeIP()
-	defer returnFn1()
-	advAddr := ip1.String()
-
-	c := DefaultConfig()
-	c.BindAddr = advAddr + ":5000"
-	c.NodeName = "test1"
-	c.Server = true
-	c.Tags = map[string]string{"role": "test"}
-	c.LogLevel = logLevel
-	c.DevMode = true
-	c.DataDir = dir
-	c.BootstrapExpect = 1
-
-	a := NewAgent(c)
-	err = a.Start()
-	require.NoError(t, err)
-	time.Sleep(2 * time.Second)
-
-	// Test error with no job
-	_, err = a.RunQuery("foo", &Execution{})
-	assert.True(t, errors.Is(err, buntdb.ErrNotFound))
-
-	j1 := &Job{
-		Name:     "test_job",
-		Schedule: "@daily",
-	}
-	err = a.Store.SetJob(j1, false)
-	require.NoError(t, err)
-
-	a.sched.Start([]*Job{j1}, a)
-
-	_, err = a.RunQuery("test_job", &Execution{})
-	assert.NoError(t, err)
-
-	a.Stop()
-}