diff --git a/core/vm/instructions.go b/core/vm/instructions.go
index a2eb9e9a95..8ca9bac296 100644
--- a/core/vm/instructions.go
+++ b/core/vm/instructions.go
@@ -357,6 +357,7 @@ func opExtCodeSize(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext)
 		witness.AddCode(interpreter.evm.StateDB.GetCode(address))
 		witness.AddCode(interpreter.evm.StateDB.ResolveCode(address))
 	}
+	// TODO this should not need to pull up the whole code
 	code := interpreter.evm.StateDB.GetCode(slot.Bytes20())
 	if isEOFVersion1(code) {
 		slot.SetUint64(2)
@@ -450,6 +451,7 @@ func opExtCodeHash(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext)
 	if interpreter.evm.StateDB.Empty(address) {
 		slot.Clear()
 	} else {
+		// TODO this should not need to pull up the whole code
 		code := interpreter.evm.StateDB.GetCode(address)
 		if HasEOFByte(code) {
 			slot.SetFromHex("0x9dbf3648db8210552e9c4f75c6a1c3057c0ca432043bd648be15fe7be05646f5")