diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.kt
index 56cb59f245..9f3db4a7be 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.kt
@@ -39,7 +39,6 @@ import org.session.libsession.snode.SnodeAPI
 import org.session.libsession.utilities.StringSubstitutionConstants.TIME_LARGE_KEY
 import org.session.libsession.utilities.TextSecurePreferences.Companion.getLocalNumber
 import org.session.libsession.utilities.ThemeUtil
-import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.components.emoji.EmojiImageView
 import org.thoughtcrime.securesms.components.emoji.RecentEmojiPageModel
 import org.thoughtcrime.securesms.components.menu.ActionItem
diff --git a/app/src/main/res/layout/activity_message_detail.xml b/app/src/main/res/layout/activity_message_detail.xml
deleted file mode 100644
index d59a561368..0000000000
--- a/app/src/main/res/layout/activity_message_detail.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    android:background="@color/transparent"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingStart="@dimen/medium_spacing"
-        android:paddingTop="@dimen/very_large_spacing"
-        android:paddingEnd="@dimen/medium_spacing">
-
-        <TableLayout
-            android:id="@+id/metadata_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:shrinkColumns="1">
-
-            <TableRow
-                android:id="@+id/sent_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingHorizontal="@dimen/small_spacing">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/disappearingMessagesSent"
-                    android:gravity="end"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/sent_time"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    tools:text="Jan 18, 2015, 12:29:37 AM GMT-08:00" />
-
-            </TableRow>
-
-            <TableRow
-                android:id="@+id/expires_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingHorizontal="@dimen/small_spacing"
-                android:layout_marginTop="@dimen/medium_spacing"
-                android:visibility="gone"
-                tools:visibility="visible">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/message_details_header__disappears"
-                    android:gravity="end"
-                    android:textStyle="bold"/>
-
-                <TextView
-                    android:id="@+id/expires_in"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    tools:text="1 week"/>
-
-            </TableRow>
-
-            <TableRow
-                android:id="@+id/error_container"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingHorizontal="@dimen/small_spacing"
-                android:layout_marginTop="@dimen/medium_spacing">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/theError"
-                    android:gravity="end"
-                    android:textStyle="bold"/>
-
-                <TextView
-                    android:id="@+id/error_message"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:textIsSelectable="true"
-                    tools:text="Send Failed"/>
-
-            </TableRow>
-
-        </TableLayout>
-
-        <LinearLayout
-            android:id="@+id/resend_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/very_large_spacing"
-            android:gravity="start">
-
-            <Button
-                android:id="@+id/resend_button"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/medium_button_height"
-                style="@style/Widget.Session.Button.Common.ProminentOutline"
-                android:text="@string/resend" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/libsession/src/main/res/values/strings.xml b/libsession/src/main/res/values/strings.xml
index 68957383b0..8ca60dfd0b 100644
--- a/libsession/src/main/res/values/strings.xml
+++ b/libsession/src/main/res/values/strings.xml
@@ -49,11 +49,6 @@
 
     <!-- ========== STRAGGLERS SECTION ========== -->
 
-    <!-- USED: activity_message_detail - bolded text before disappearing message time on message info fragment, e.g., "Disappears: 12 hours"
-         Figma: Unable to locate usage in Figma.
-    -->
-    <string name="message_details_header__disappears">Disappears</string>
-
     <!-- REQUIRED: Title on media picker when you go to send an image - this can be either to a specific Button on the `Set Display Picture` dialog used to instigate choosing a profile picture to set.
          person, to to a closed group, or to a community (in the latter two cases it will show the group name).
          Figma: Unable to locate usage in Figma.