diff --git a/core/app/app.go b/core/app/app.go
index 99263953e255..2295b0300835 100644
--- a/core/app/app.go
+++ b/core/app/app.go
@@ -20,7 +20,7 @@ type QueryResponse struct {
 	Value  []byte
 }
 
-type BlockRequest[T any] struct {
+type BlockRequest[T transaction.Tx] struct {
 	Height            uint64
 	Time              time.Time
 	Hash              []byte
diff --git a/core/store/database.go b/core/store/database.go
deleted file mode 100644
index ef36b8967980..000000000000
--- a/core/store/database.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package store
-
-// DatabaseService provides access to the underlying database for CRUD operations of non-consensus data.
-// WARNING: using this api will make your module unprovable for fraud and validity proofs
-type DatabaseService interface {
-	Database() NonConsensusStore
-}
-
-// NonConsensusStore is a simple key-value store that is used to store non-consensus data.
-// Note the non-consensus data is not committed to the blockchain and does not allow iteration
-type NonConsensusStore interface {
-	// Get returns nil iff key doesn't exist. Errors on nil key.
-	Get(key []byte) ([]byte, error)
-
-	// Has checks if a key exists. Errors on nil key.
-	Has(key []byte) (bool, error)
-
-	// Set sets the key. Errors on nil key or value.
-	Set(key, value []byte) error
-
-	// Delete deletes the key. Errors on nil key.
-	Delete(key []byte) error
-}
diff --git a/core/store/service.go b/core/store/service.go
index 05757b8362c1..11eeaf0de9b3 100644
--- a/core/store/service.go
+++ b/core/store/service.go
@@ -21,6 +21,8 @@ type MemoryStoreService interface {
 // TransientStoreService represents a unique, non-forgeable handle to a memory-backed
 // KVStore which is reset at the start of every block. It should be provided as
 // a module-scoped dependency by the runtime module being used to build the app.
+// WARNING: This service is not available in server/v2 apps. Store/v2 does not support
+// transient stores.
 type TransientStoreService interface {
 	// OpenTransientStore retrieves the transient store from the context.
 	OpenTransientStore(context.Context) KVStore