diff --git a/abci/client/mocks/client.go b/abci/client/mocks/client.go
index add3c2ae9..81c680433 100644
--- a/abci/client/mocks/client.go
+++ b/abci/client/mocks/client.go
@@ -419,18 +419,3 @@ func (_m *Client) VerifyVoteExtension(_a0 context.Context, _a1 *types.RequestVer
 func (_m *Client) Wait() {
 	_m.Called()
 }
-
-type NewClientT interface {
-	mock.TestingT
-	Cleanup(func())
-}
-
-// NewClient creates a new instance of Client. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewClient(t NewClientT) *Client {
-	mock := &Client{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
diff --git a/abci/types/mocks/application.go b/abci/types/mocks/application.go
index 62cf92905..f69efd3bb 100644
--- a/abci/types/mocks/application.go
+++ b/abci/types/mocks/application.go
@@ -335,18 +335,3 @@ func (_m *Application) VerifyVoteExtension(_a0 context.Context, _a1 *types.Reque
 
 	return r0, r1
 }
-
-type NewApplicationT interface {
-	mock.TestingT
-	Cleanup(func())
-}
-
-// NewApplication creates a new instance of Application. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewApplication(t NewApplicationT) *Application {
-	mock := &Application{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
diff --git a/internal/consensus/mocks/cons_sync_reactor.go b/internal/consensus/mocks/cons_sync_reactor.go
index 2c694742b..5ac592f0d 100644
--- a/internal/consensus/mocks/cons_sync_reactor.go
+++ b/internal/consensus/mocks/cons_sync_reactor.go
@@ -26,18 +26,3 @@ func (_m *ConsSyncReactor) SetStateSyncingMetrics(_a0 float64) {
 func (_m *ConsSyncReactor) SwitchToConsensus(_a0 state.State, _a1 bool) {
 	_m.Called(_a0, _a1)
 }
-
-type NewConsSyncReactorT interface {
-	mock.TestingT
-	Cleanup(func())
-}
-
-// NewConsSyncReactor creates a new instance of ConsSyncReactor. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewConsSyncReactor(t NewConsSyncReactorT) *ConsSyncReactor {
-	mock := &ConsSyncReactor{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
diff --git a/internal/evidence/mocks/block_store.go b/internal/evidence/mocks/block_store.go
index b0c67ff87..ef3346b2a 100644
--- a/internal/evidence/mocks/block_store.go
+++ b/internal/evidence/mocks/block_store.go
@@ -57,18 +57,3 @@ func (_m *BlockStore) LoadBlockMeta(height int64) *types.BlockMeta {
 
 	return r0
 }
-
-type NewBlockStoreT interface {
-	mock.TestingT
-	Cleanup(func())
-}
-
-// NewBlockStore creates a new instance of BlockStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewBlockStore(t NewBlockStoreT) *BlockStore {
-	mock := &BlockStore{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
diff --git a/internal/mempool/mocks/mempool.go b/internal/mempool/mocks/mempool.go
index e1f6994d2..7f4969eaa 100644
--- a/internal/mempool/mocks/mempool.go
+++ b/internal/mempool/mocks/mempool.go
@@ -170,18 +170,3 @@ func (_m *Mempool) Update(ctx context.Context, blockHeight int64, blockTxs types
 
 	return r0
 }
-
-type NewMempoolT interface {
-	mock.TestingT
-	Cleanup(func())
-}
-
-// NewMempool creates a new instance of Mempool. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewMempool(t NewMempoolT) *Mempool {
-	mock := &Mempool{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
diff --git a/internal/p2p/mocks/connection.go b/internal/p2p/mocks/connection.go
index 766bbf657..576fb2386 100644
--- a/internal/p2p/mocks/connection.go
+++ b/internal/p2p/mocks/connection.go
@@ -150,18 +150,3 @@ func (_m *Connection) String() string {
 
 	return r0
 }
-
-type NewConnectionT interface {
-	mock.TestingT
-	Cleanup(func())
-}
-
-// NewConnection creates a new instance of Connection. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewConnection(t NewConnectionT) *Connection {
-	mock := &Connection{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
diff --git a/internal/p2p/mocks/transport.go b/internal/p2p/mocks/transport.go
index 436c961c3..591fe8044 100644
--- a/internal/p2p/mocks/transport.go
+++ b/internal/p2p/mocks/transport.go
@@ -148,18 +148,3 @@ func (_m *Transport) String() string {
 
 	return r0
 }
-
-type NewTransportT interface {
-	mock.TestingT
-	Cleanup(func())
-}
-
-// NewTransport creates a new instance of Transport. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewTransport(t NewTransportT) *Transport {
-	mock := &Transport{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
diff --git a/internal/state/indexer/mocks/event_sink.go b/internal/state/indexer/mocks/event_sink.go
index a7221a087..d5555a417 100644
--- a/internal/state/indexer/mocks/event_sink.go
+++ b/internal/state/indexer/mocks/event_sink.go
@@ -165,18 +165,3 @@ func (_m *EventSink) Type() indexer.EventSinkType {
 
 	return r0
 }
-
-type NewEventSinkT interface {
-	mock.TestingT
-	Cleanup(func())
-}
-
-// NewEventSink creates a new instance of EventSink. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewEventSink(t NewEventSinkT) *EventSink {
-	mock := &EventSink{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
diff --git a/internal/state/mocks/block_store.go b/internal/state/mocks/block_store.go
index 3b8eca45e..ad9c817bc 100644
--- a/internal/state/mocks/block_store.go
+++ b/internal/state/mocks/block_store.go
@@ -229,18 +229,3 @@ func (_m *BlockStore) Size() int64 {
 
 	return r0
 }
-
-type NewBlockStoreT interface {
-	mock.TestingT
-	Cleanup(func())
-}
-
-// NewBlockStore creates a new instance of BlockStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewBlockStore(t NewBlockStoreT) *BlockStore {
-	mock := &BlockStore{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
diff --git a/internal/state/mocks/evidence_pool.go b/internal/state/mocks/evidence_pool.go
index 98abb4776..04e8be7bc 100644
--- a/internal/state/mocks/evidence_pool.go
+++ b/internal/state/mocks/evidence_pool.go
@@ -71,18 +71,3 @@ func (_m *EvidencePool) PendingEvidence(maxBytes int64) ([]types.Evidence, int64
 func (_m *EvidencePool) Update(_a0 context.Context, _a1 state.State, _a2 types.EvidenceList) {
 	_m.Called(_a0, _a1, _a2)
 }
-
-type NewEvidencePoolT interface {
-	mock.TestingT
-	Cleanup(func())
-}
-
-// NewEvidencePool creates a new instance of EvidencePool. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewEvidencePool(t NewEvidencePoolT) *EvidencePool {
-	mock := &EvidencePool{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
diff --git a/internal/state/mocks/store.go b/internal/state/mocks/store.go
index 94d5614e6..3915b94d7 100644
--- a/internal/state/mocks/store.go
+++ b/internal/state/mocks/store.go
@@ -187,18 +187,3 @@ func (_m *Store) SaveValidatorSets(_a0 int64, _a1 int64, _a2 *types.ValidatorSet
 
 	return r0
 }
-
-type NewStoreT interface {
-	mock.TestingT
-	Cleanup(func())
-}
-
-// NewStore creates a new instance of Store. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewStore(t NewStoreT) *Store {
-	mock := &Store{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
diff --git a/internal/statesync/mocks/state_provider.go b/internal/statesync/mocks/state_provider.go
index 17ddb54ac..b8d681631 100644
--- a/internal/statesync/mocks/state_provider.go
+++ b/internal/statesync/mocks/state_provider.go
@@ -82,18 +82,3 @@ func (_m *StateProvider) State(ctx context.Context, height uint64) (state.State,
 
 	return r0, r1
 }
-
-type NewStateProviderT interface {
-	mock.TestingT
-	Cleanup(func())
-}
-
-// NewStateProvider creates a new instance of StateProvider. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewStateProvider(t NewStateProviderT) *StateProvider {
-	mock := &StateProvider{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
diff --git a/libs/time/mocks/source.go b/libs/time/mocks/source.go
index 386d20c45..a8e49b314 100644
--- a/libs/time/mocks/source.go
+++ b/libs/time/mocks/source.go
@@ -26,18 +26,3 @@ func (_m *Source) Now() time.Time {
 
 	return r0
 }
-
-type NewSourceT interface {
-	mock.TestingT
-	Cleanup(func())
-}
-
-// NewSource creates a new instance of Source. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewSource(t NewSourceT) *Source {
-	mock := &Source{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
diff --git a/light/provider/mocks/provider.go b/light/provider/mocks/provider.go
index af2e9c930..1b4e583de 100644
--- a/light/provider/mocks/provider.go
+++ b/light/provider/mocks/provider.go
@@ -65,18 +65,3 @@ func (_m *Provider) ReportEvidence(_a0 context.Context, _a1 types.Evidence) erro
 
 	return r0
 }
-
-type NewProviderT interface {
-	mock.TestingT
-	Cleanup(func())
-}
-
-// NewProvider creates a new instance of Provider. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewProvider(t NewProviderT) *Provider {
-	mock := &Provider{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
diff --git a/light/rpc/mocks/light_client.go b/light/rpc/mocks/light_client.go
index 4130c9575..347d14707 100644
--- a/light/rpc/mocks/light_client.go
+++ b/light/rpc/mocks/light_client.go
@@ -115,18 +115,3 @@ func (_m *LightClient) VerifyLightBlockAtHeight(ctx context.Context, height int6
 
 	return r0, r1
 }
-
-type NewLightClientT interface {
-	mock.TestingT
-	Cleanup(func())
-}
-
-// NewLightClient creates a new instance of LightClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewLightClient(t NewLightClientT) *LightClient {
-	mock := &LightClient{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
diff --git a/rpc/client/mocks/client.go b/rpc/client/mocks/client.go
index 5e766a6d2..c200a14cd 100644
--- a/rpc/client/mocks/client.go
+++ b/rpc/client/mocks/client.go
@@ -818,18 +818,3 @@ func (_m *Client) Validators(ctx context.Context, height *int64, page *int, perP
 
 	return r0, r1
 }
-
-type NewClientT interface {
-	mock.TestingT
-	Cleanup(func())
-}
-
-// NewClient creates a new instance of Client. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewClient(t NewClientT) *Client {
-	mock := &Client{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}