diff --git a/client/consensus/grandpa/auxSchema.go b/client/consensus/grandpa/auxSchema.go
index 6cf702b7da..861d5d0fcc 100644
--- a/client/consensus/grandpa/auxSchema.go
+++ b/client/consensus/grandpa/auxSchema.go
@@ -25,11 +25,6 @@ type SharedVoterSetState[H comparable, N constraints.Unsigned] struct {
 	inner VoterSetState[H, N]
 }
 
-// TODO this is actually build in another PR, replace when merged
-type SharedAuthoritySet[H comparable, N constraints.Unsigned] struct {
-	inner AuthoritySet[H, N]
-}
-
 type PersistentData[H comparable, N constraints.Unsigned] struct {
 	authoritySet SharedAuthoritySet[H, N] // TODO this needs to be shared auth set
 	setState     SharedVoterSetState[H, N]
diff --git a/client/consensus/grandpa/environment.go b/client/consensus/grandpa/environment.go
index 23e4c5feea..b93060ad15 100644
--- a/client/consensus/grandpa/environment.go
+++ b/client/consensus/grandpa/environment.go
@@ -35,7 +35,6 @@ const NumLastCompletedRounds = 2
 // CompletedRounds Data about last completed rounds within a single voter set. Stores
 // NumLastCompletedRounds and always contains data about at least one round
 // (genesis).
-// TODO might require custom encoding?
 type CompletedRounds[H comparable, N constraints.Unsigned] struct {
 	Rounds []CompletedRound[H, N]
 	SetId  uint64