diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -383,8 +383,8 @@
             "data encoded in hexadecimal (byte-for-byte)\n"
             "         \"txid\" : \"xxxx\",             (string) transaction id "
             "encoded in little-endian hexadecimal\n"
-            "         \"hash\" : \"xxxx\",             (string) hash encoded "
-            "in little-endian hexadecimal (including witness data)\n"
+            "         \"hash\" : \"xxxx\",             (string) transaction "
+            "hash encoded in little-endian hexadecimal (same as txid)\n"
             "         \"depends\" : [                (array) array of numbers "
             "\n"
             "             n                          (numeric) transactions "
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -110,8 +110,8 @@
             "data for 'txid'\n"
             "  \"txid\" : \"id\",        (string) The transaction id (same as "
             "provided)\n"
-            "  \"hash\" : \"id\",        (string) The transaction hash "
-            "(differs from txid for witness transactions)\n"
+            "  \"hash\" : \"id\",        (string) The transaction hash (same "
+            "as txid)\n"
             "  \"size\" : n,             (numeric) The serialized transaction "
             "size\n"
             "  \"version\" : n,          (numeric) The version\n"
@@ -592,8 +592,8 @@
             "\nResult:\n"
             "{\n"
             "  \"txid\" : \"id\",        (string) The transaction id\n"
-            "  \"hash\" : \"id\",        (string) The transaction hash "
-            "(differs from txid for witness transactions)\n"
+            "  \"hash\" : \"id\",        (string) The transaction hash (same "
+            "as txid)\n"
             "  \"size\" : n,             (numeric) The transaction size\n"
             "  \"version\" : n,          (numeric) The version\n"
             "  \"locktime\" : ttt,       (numeric) The lock time\n"
diff --git a/src/test/sigopcount_tests.cpp b/src/test/sigopcount_tests.cpp
--- a/src/test/sigopcount_tests.cpp
+++ b/src/test/sigopcount_tests.cpp
@@ -112,7 +112,7 @@
 
 /**
  * Verifies script execution of the zeroth scriptPubKey of tx output and zeroth
- * scriptSig and witness of tx input.
+ * scriptSig of tx input.
  */
 ScriptError VerifyWithFlag(const CTransaction &output,
                            const CMutableTransaction &input, int flags) {
@@ -127,8 +127,8 @@
 }
 
 /**
- * Builds a creationTx from scriptPubKey and a spendingTx from scriptSig and
- * witness such that spendingTx spends output zero of creationTx. Also inserts
+ * Builds a creationTx from scriptPubKey and a spendingTx from scriptSig
+ * such that spendingTx spends output zero of creationTx. Also inserts
  * creationTx's output into the coins view.
  */
 void BuildTxs(CMutableTransaction &spendingTx, CCoinsViewCache &coins,
diff --git a/src/validation.cpp b/src/validation.cpp
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -1220,11 +1220,6 @@
         const Coin &coin = inputs.AccessCoin(prevout);
         assert(!coin.IsSpent());
 
-        // We very carefully only pass in things to CScriptCheck which are
-        // clearly committed to by tx' witness hash. This provides a sanity
-        // check that our caching is not introducing consensus failures through
-        // additional data in, eg, the coins being spent being checked as a part
-        // of CScriptCheck.
         const CScript &scriptPubKey = coin.GetTxOut().scriptPubKey;
         const Amount amount = coin.GetTxOut().nValue;
 
diff --git a/test/functional/test_framework/script.py b/test/functional/test_framework/script.py
--- a/test/functional/test_framework/script.py
+++ b/test/functional/test_framework/script.py
@@ -688,9 +688,6 @@
 
 # TODO: Allow cached hashPrevouts/hashSequence/hashOutputs to be provided.
 # Performance optimization probably not necessary for python tests, however.
-# Note that this corresponds to sigversion == 1 in EvalScript, which is used
-# for version 0 witnesses.
-
 
 def SignatureHashForkId(script, txTo, inIdx, hashtype, amount):