diff --git a/bubble-server/src/main/java/bubble/dao/account/AccountDAO.java b/bubble-server/src/main/java/bubble/dao/account/AccountDAO.java
index 6a40c07e..a5075bf7 100644
--- a/bubble-server/src/main/java/bubble/dao/account/AccountDAO.java
+++ b/bubble-server/src/main/java/bubble/dao/account/AccountDAO.java
@@ -348,23 +348,24 @@ public class AccountDAO extends AbstractCRUDDAO<Account> implements SqlViewSearc
         // stash the deletion policy for later use, the policy object will be deleted in deleteDependencies
         final var deletionPolicy = policyDAO.findSingleByAccount(uuid).getDeletionPolicy();
 
-        log.info("delete ("+currentThread().getName()+"): starting to delete account-dependent objects");
+        log.info("delete: starting to delete account-dependent objects - " + currentThread().getName());
         configuration.deleteDependencies(account);
-        log.info("delete: finished deleting account-dependent objects");
+        log.info("delete: finished deleting account-dependent objects - " + currentThread().getName());
 
         switch (deletionPolicy) {
             case full_delete:
                 super.delete(uuid);
                 return;
-            case block_delete: default:
+            default:
+                // includes case block_delete
                 update(account.setParent(null)
-                        .setAdmin(null)
-                        .setSuspended(null)
-                        .setDescription(null)
-                        .setDeleted()
-                        .setUrl(null)
-                        .setAutoUpdatePolicy(EMPTY_AUTO_UPDATE_POLICY)
-                        .setHashedPassword(HashedPassword.DELETED));
+                              .setAdmin(null)
+                              .setSuspended(null)
+                              .setDescription(null)
+                              .setDeleted()
+                              .setUrl(null)
+                              .setAutoUpdatePolicy(EMPTY_AUTO_UPDATE_POLICY)
+                              .setHashedPassword(HashedPassword.DELETED));
                 return;
         }
     }
diff --git a/bubble-server/src/main/java/bubble/model/bill/AccountPaymentArchived.java b/bubble-server/src/main/java/bubble/model/bill/AccountPaymentArchived.java
index 9b9b0ac1..3c22ba88 100644
--- a/bubble-server/src/main/java/bubble/model/bill/AccountPaymentArchived.java
+++ b/bubble-server/src/main/java/bubble/model/bill/AccountPaymentArchived.java
@@ -29,13 +29,6 @@ import static org.cobbzilla.wizard.model.crypto.EncryptedTypes.ENC_PAD;
 @Entity @Accessors(chain=true)
 public class AccountPaymentArchived extends IdentifiableBase {
 
-    /**
-     * List of properties from AccountPayment class which will not be used in this class the same way. Those foreign
-     * keys (uuids) will not be available within referenced tables, and so here the other unique data from those
-     * elements is extracted.
-     */
-    private static final String[] ALTERED_FIELDS = { "account", "paymentMethod", "plan", "accountPlan", "bill" };
-
     public AccountPaymentArchived(@NonNull final String accountUuid, @NonNull final List<Bill> bills,
                                   @NonNull final List<AccountPayment> payments,
                                   @NonNull final List<AccountPaymentMethod> paymentMethods) {