diff --git a/core/src/main/java/com/google/bitcoin/store/WalletProtobufSerializer.java b/core/src/main/java/com/google/bitcoin/store/WalletProtobufSerializer.java
index c60547648..2f9aee706 100644
--- a/core/src/main/java/com/google/bitcoin/store/WalletProtobufSerializer.java
+++ b/core/src/main/java/com/google/bitcoin/store/WalletProtobufSerializer.java
@@ -401,11 +401,6 @@ public class WalletProtobufSerializer {
                 return;
             }
             confidence.setDepthInBlocks(confidenceProto.getDepth());
-        } else {
-            // TEMPORARY CODE FOR MIGRATING 0.5 WALLETS TO 0.6
-            if (chainHeight != 0 && confidenceProto.hasAppearedAtHeight()) {
-                confidence.setDepthInBlocks(chainHeight - confidence.getAppearedAtChainHeight() + 1);
-            }
         }
         if (confidenceProto.hasWorkDone()) {
             if (confidence.getConfidenceType() != ConfidenceType.BUILDING) {
diff --git a/tools/src/main/java/com/google/bitcoin/tools/WalletTool.java b/tools/src/main/java/com/google/bitcoin/tools/WalletTool.java
index e6c20de55..94e59dc97 100644
--- a/tools/src/main/java/com/google/bitcoin/tools/WalletTool.java
+++ b/tools/src/main/java/com/google/bitcoin/tools/WalletTool.java
@@ -318,14 +318,6 @@ public class WalletTool {
 
         try {
             WalletProtobufSerializer loader = new WalletProtobufSerializer();
-            if (chainFileName.exists() && modeFlag.value(options).equals(ValidationMode.SPV)) {
-                // TEMPORARY MIGRATION CODE FOR 0.5 -> 0.6 TRANSITION. This will ensure the depth (but NOT workDone)
-                // fields gets set correctly for older wallets.
-                store = new BoundedOverheadBlockStore(params, chainFileName);
-                loader.setChainHeight(store.getChainHead().getHeight());
-                store.close();
-                store = null;
-            }
             wallet = loader.readWallet(new BufferedInputStream(new FileInputStream(walletFile)));
             if (!wallet.getParams().equals(params)) {
                 System.err.println("Wallet does not match requested network parameters: " +