diff --git a/atproto/identity/mock_directory.go b/atproto/identity/mock_directory.go
index 84539557..c8558c9b 100644
--- a/atproto/identity/mock_directory.go
+++ b/atproto/identity/mock_directory.go
@@ -11,7 +11,7 @@ import (
 
 // A fake identity directory, for use in tests
 type MockDirectory struct {
-	mu         *sync.RWMutex
+	mu         sync.RWMutex
 	Handles    map[syntax.Handle]syntax.DID
 	Identities map[syntax.DID]Identity
 }
@@ -21,7 +21,6 @@ var _ Resolver = (*MockDirectory)(nil)
 
 func NewMockDirectory() MockDirectory {
 	return MockDirectory{
-		mu:         &sync.RWMutex{},
 		Handles:    make(map[syntax.Handle]syntax.DID),
 		Identities: make(map[syntax.DID]Identity),
 	}
diff --git a/bgs/bgs.go b/bgs/bgs.go
index 5ab61c5f..b76d975a 100644
--- a/bgs/bgs.go
+++ b/bgs/bgs.go
@@ -158,8 +158,7 @@ func NewBGS(db *gorm.DB, ix *indexer.Indexer, repoman *repomgr.RepoManager, evtm
 		didr:    didr,
 		ssl:     config.SSL,
 
-		consumersLk: sync.RWMutex{},
-		consumers:   make(map[uint64]*SocketConsumer),
+		consumers: make(map[uint64]*SocketConsumer),
 
 		pdsResyncs: make(map[uint]*PDSResync),
 
diff --git a/cmd/relay/relay/relay.go b/cmd/relay/relay/relay.go
index 51fc0117..2985f8bb 100644
--- a/cmd/relay/relay/relay.go
+++ b/cmd/relay/relay/relay.go
@@ -10,7 +10,7 @@ import (
 	"github.com/bluesky-social/indigo/cmd/relay/stream/eventmgr"
 
 	"github.com/RussellLuo/slidingwindow"
-	"github.com/hashicorp/golang-lru/v2"
+	lru "github.com/hashicorp/golang-lru/v2"
 	"go.opentelemetry.io/otel"
 	"gorm.io/gorm"
 )
@@ -81,8 +81,7 @@ func NewRelay(db *gorm.DB, evtman *eventmgr.EventManager, dir identity.Directory
 		HostChecker: hc,
 		Config:      *config,
 
-		consumersLk: sync.RWMutex{},
-		consumers:   make(map[uint64]*SocketConsumer),
+		consumers: make(map[uint64]*SocketConsumer),
 
 		accountCache: uc,
 
diff --git a/cmd/sonar/sonar.go b/cmd/sonar/sonar.go
index fb3b5ba1..a965bcdb 100644
--- a/cmd/sonar/sonar.go
+++ b/cmd/sonar/sonar.go
@@ -78,7 +78,6 @@ func NewSonar(logger *slog.Logger, cursorFile string, socketURL string) (*Sonar,
 			LastSeq: -1,
 		},
 		Logger:     logger,
-		ProgMux:    sync.Mutex{},
 		CursorFile: cursorFile,
 	}