diff --git a/les/access_test.go b/les/access_test.go
index 252a0259eb..5c9b0afd58 100644
--- a/les/access_test.go
+++ b/les/access_test.go
@@ -11,7 +11,14 @@ import (
 	"github.com/ethereum/go-ethereum/crypto/sha3"
 )
 
-var testBankSecureTrieKey = sha3.NewKeccak256().Sum(testBankAddress[:])
+var testBankSecureTrieKey = secAddr(testBankAddress)
+
+func secAddr(addr common.Address) []byte {
+	sha := sha3.NewKeccak256()
+	sha.Write(addr[:])
+	return sha.Sum(nil)
+}
+
 
 type accessTestFn func(ca *access.ChainAccess, bc *core.BlockChain, bhash common.Hash) access.ObjectAccess
 
diff --git a/les/metrics.go b/les/metrics.go
index d533625a8a..88e6726e24 100644
--- a/les/metrics.go
+++ b/les/metrics.go
@@ -94,29 +94,6 @@ func (rw *meteredMsgReadWriter) ReadMsg() (p2p.Msg, error) {
 	}
 	// Account for the data traffic
 	packets, traffic := miscInPacketsMeter, miscInTrafficMeter
-	/*	switch {
-		case rw.version < eth62 && msg.Code == BlockHashesMsg:
-			packets, traffic = reqHashInPacketsMeter, reqHashInTrafficMeter
-		case rw.version < eth62 && msg.Code == BlocksMsg:
-			packets, traffic = reqBlockInPacketsMeter, reqBlockInTrafficMeter
-
-		case rw.version >= eth62 && msg.Code == BlockHeadersMsg:
-			packets, traffic = reqBlockInPacketsMeter, reqBlockInTrafficMeter
-		case rw.version >= eth62 && msg.Code == BlockBodiesMsg:
-			packets, traffic = reqBodyInPacketsMeter, reqBodyInTrafficMeter
-
-		case rw.version >= eth63 && msg.Code == NodeDataMsg:
-			packets, traffic = reqStateInPacketsMeter, reqStateInTrafficMeter
-		case rw.version >= eth63 && msg.Code == ReceiptsMsg:
-			packets, traffic = reqReceiptInPacketsMeter, reqReceiptInTrafficMeter
-
-		case msg.Code == NewBlockHashesMsg:
-			packets, traffic = propHashInPacketsMeter, propHashInTrafficMeter
-		case msg.Code == NewBlockMsg:
-			packets, traffic = propBlockInPacketsMeter, propBlockInTrafficMeter
-		case msg.Code == TxMsg:
-			packets, traffic = propTxnInPacketsMeter, propTxnInTrafficMeter
-		}*/
 	packets.Mark(1)
 	traffic.Mark(int64(msg.Size))
 
@@ -126,29 +103,6 @@ func (rw *meteredMsgReadWriter) ReadMsg() (p2p.Msg, error) {
 func (rw *meteredMsgReadWriter) WriteMsg(msg p2p.Msg) error {
 	// Account for the data traffic
 	packets, traffic := miscOutPacketsMeter, miscOutTrafficMeter
-	/*	switch {
-		case rw.version < eth62 && msg.Code == BlockHashesMsg:
-			packets, traffic = reqHashOutPacketsMeter, reqHashOutTrafficMeter
-		case rw.version < eth62 && msg.Code == BlocksMsg:
-			packets, traffic = reqBlockOutPacketsMeter, reqBlockOutTrafficMeter
-
-		case rw.version >= eth62 && msg.Code == BlockHeadersMsg:
-			packets, traffic = reqHeaderOutPacketsMeter, reqHeaderOutTrafficMeter
-		case rw.version >= eth62 && msg.Code == BlockBodiesMsg:
-			packets, traffic = reqBodyOutPacketsMeter, reqBodyOutTrafficMeter
-
-		case rw.version >= eth63 && msg.Code == NodeDataMsg:
-			packets, traffic = reqStateOutPacketsMeter, reqStateOutTrafficMeter
-		case rw.version >= eth63 && msg.Code == ReceiptsMsg:
-			packets, traffic = reqReceiptOutPacketsMeter, reqReceiptOutTrafficMeter
-
-		case msg.Code == NewBlockHashesMsg:
-			packets, traffic = propHashOutPacketsMeter, propHashOutTrafficMeter
-		case msg.Code == NewBlockMsg:
-			packets, traffic = propBlockOutPacketsMeter, propBlockOutTrafficMeter
-		case msg.Code == TxMsg:
-			packets, traffic = propTxnOutPacketsMeter, propTxnOutTrafficMeter
-		}*/
 	packets.Mark(1)
 	traffic.Mark(int64(msg.Size))
 
diff --git a/trie/proof.go b/trie/proof.go
index 10906dc395..bfadceb5ab 100644
--- a/trie/proof.go
+++ b/trie/proof.go
@@ -109,7 +109,8 @@ func StoreProof(db Database, proof MerkleProof) {
 	sha := sha3.NewKeccak256()
 	for _, buf := range proof {
 		sha.Reset()
-		hash := sha.Sum(buf)
+		sha.Write(buf)
+		hash := sha.Sum(nil)
 		val, _ := db.Get(hash)
 		if val == nil {
 			db.Put(hash, buf)