diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/ContactListAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/ContactListAdapter.kt
index 29a94cdcd4..245b14da56 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/ContactListAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/ContactListAdapter.kt
@@ -4,15 +4,10 @@ import android.content.Context
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import network.loki.messenger.R
 import network.loki.messenger.databinding.ContactSectionHeaderBinding
 import network.loki.messenger.databinding.ViewContactBinding
 import org.session.libsession.utilities.recipients.Recipient
-import org.session.libsignal.utilities.Log
-import org.thoughtcrime.securesms.database.Storage
 import org.thoughtcrime.securesms.mms.GlideRequests
-import org.thoughtcrime.securesms.showSessionDialog
-import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities
 
 sealed class ContactListItem {
     class Header(val name: String) : ContactListItem()
@@ -41,7 +36,7 @@ class ContactListAdapter(
             binding.nameTextView.text = contact.displayName
             binding.root.setOnClickListener { listener(contact.recipient) }
 
-            // TODO: When we implement deleting contacts then probably do it here w/ something like:
+            // TODO: When we implement deleting contacts (hide might be safest) then probably set a long-click listener here w/ something like:
             /*
             binding.root.setOnLongClickListener {
                 Log.w("[ACL]", "Long clicked on contact ${contact.recipient.name}")
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
index 380b816f24..9bc1195f74 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
@@ -1373,9 +1373,10 @@ open class Storage(
         threadDB.deleteConversation(threadID)
 
         val recipient = getRecipientForThread(threadID)
-        if (recipient == null) { Log.w(TAG, "Got null recipient when deleting conversation - aborting."); return }
-
-        Log.w("[ACL]", "When deleting conversation, recipient is: ${recipient.name}")
+        if (recipient == null) {
+            Log.w(TAG, "Got null recipient when deleting conversation - aborting.");
+            return
+        }
 
         when {
             // Note: We don't do anything if the thread is a 1-on-1 and the recipient is a contact
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
index c8605b1a59..f799a295e5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
@@ -63,6 +63,7 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public class ThreadDatabase extends Database {
 
@@ -187,8 +188,6 @@ public class ThreadDatabase extends Database {
     notifyConversationListListeners();
   }
 
-  // ACL remove unused method
-  /*
   public void updateSnippet(long threadId, String snippet, @Nullable Uri attachment, long date, long type, boolean unarchive) {
     ContentValues contentValues = new ContentValues(4);
 
@@ -207,7 +206,6 @@ public class ThreadDatabase extends Database {
     db.update(TABLE_NAME, contentValues, ID + " = ?", new String[] {threadId + ""});
     notifyConversationListListeners();
   }
-  */
 
   private void deleteThread(long threadId) {
     Recipient recipient = getRecipientForThreadId(threadId);
@@ -220,15 +218,11 @@ public class ThreadDatabase extends Database {
     }
   }
 
-  // ACL remove unused methods
-  /*
   private void deleteThreads(Set<Long> threadIds) {
     SQLiteDatabase db = databaseHelper.getWritableDatabase();
     String where      = "";
 
-    for (long threadId : threadIds) {
-      where += ID + " = '" + threadId + "' OR ";
-    }
+    for (long threadId : threadIds) { where += ID + " = '" + threadId + "' OR "; }
 
     where = where.substring(0, where.length() - 4);
 
@@ -245,7 +239,6 @@ public class ThreadDatabase extends Database {
     addressCache.clear();
     notifyConversationListListeners();
   }
-  */
 
   public void trimAllThreads(int length, ProgressListener listener) {
     Cursor cursor   = null;
@@ -353,17 +346,14 @@ public class ThreadDatabase extends Database {
     }};
   }
 
-  // ACL remove unused method
-  /*
   public void setDistributionType(long threadId, int distributionType) {
     ContentValues contentValues = new ContentValues(1);
-    contentValues.put(CONVERSATION_TYPE, distributionType);
+    contentValues.put(DISTRIBUTION_TYPE, distributionType);
 
     SQLiteDatabase db = databaseHelper.getWritableDatabase();
     db.update(TABLE_NAME, contentValues, ID_WHERE, new String[] {threadId + ""});
     notifyConversationListListeners();
   }
-  */
 
   public void setDate(long threadId, long date) {
     ContentValues contentValues = new ContentValues(1);
@@ -622,9 +612,6 @@ public class ThreadDatabase extends Database {
   }
 
   public void deleteConversation(long threadId) {
-
-    Log.w("[ACL]", "Hit ThreadDatabase.deleteConversation");
-
     DatabaseComponent.get(context).smsDatabase().deleteThread(threadId);
     DatabaseComponent.get(context).mmsDatabase().deleteThread(threadId);
     DatabaseComponent.get(context).draftDatabase().clearDrafts(threadId);
@@ -736,9 +723,6 @@ public class ThreadDatabase extends Database {
   }
 
   public boolean update(long threadId, boolean unarchive, boolean shouldDeleteOnEmpty) {
-
-    Log.w("[ACL]", "Hit ThreadDatabase.update!");
-
     MmsSmsDatabase mmsSmsDatabase = DatabaseComponent.get(context).mmsSmsDatabase();
     long count                    = mmsSmsDatabase.getConversationCount(threadId);