diff --git a/core/chain.go b/core/chain.go
index 6a9aee66..d6707950 100644
--- a/core/chain.go
+++ b/core/chain.go
@@ -1,5 +1,7 @@
 package core
 
+// TODO: This functionality and implementation may be deprecated
+
 import (
 	"math/big"
 
diff --git a/state/database.go b/state/database.go
index 46e0a2eb..a8a5da68 100644
--- a/state/database.go
+++ b/state/database.go
@@ -15,6 +15,8 @@ import (
 	dbm "github.com/tendermint/tendermint/libs/db"
 )
 
+// TODO: This functionality and implementation may be deprecated
+
 var (
 	// CodeKey is the key used for storing Ethereum contract code in the Cosmos
 	// SDK multi-store.
diff --git a/state/trie.go b/state/trie.go
index 7d78042f..6c078c4b 100644
--- a/state/trie.go
+++ b/state/trie.go
@@ -12,6 +12,8 @@ import (
 	lru "github.com/hashicorp/golang-lru"
 )
 
+// TODO: This functionality and implementation may be deprecated
+
 const (
 	versionLen = 8
 )