diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 3ccd5c2156..02854d53d6 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -49,7 +49,6 @@
                     android:hint="@string/activity_settings_display_name_edit_text_hint"
                     android:imeOptions="actionDone"
                     android:inputType="textCapWords"
-                    android:maxLength="@integer/max_user_nickname_length_chars"
                     android:maxLines="1" />
 
                 <TextView
@@ -61,7 +60,6 @@
                     android:gravity="center"
                     android:textColor="?android:textColorPrimary"
                     android:textSize="@dimen/very_large_font_size"
-                    android:maxLength="@integer/max_user_nickname_length_chars"
                     android:textStyle="bold" />
 
             </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml b/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml
index c07e8cc523..eaad4bd8b8 100644
--- a/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml
@@ -91,7 +91,6 @@
                 android:textAlignment="center"
                 android:paddingVertical="12dp"
                 android:inputType="text"
-                android:maxLength="@integer/max_user_nickname_length_chars"
                 android:maxLines="1"
                 android:imeOptions="actionDone"
                 android:textColorHint="?android:textColorSecondary"
diff --git a/app/src/main/res/layout/view_contact.xml b/app/src/main/res/layout/view_contact.xml
deleted file mode 100644
index ceb4304cc7..0000000000
--- a/app/src/main/res/layout/view_contact.xml
+++ /dev/null
@@ -1,39 +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:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?conversation_menu_cell_color"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:id="@+id/contentView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center_vertical"
-        android:paddingHorizontal="@dimen/large_spacing"
-        android:paddingVertical="@dimen/small_spacing">
-
-        <org.thoughtcrime.securesms.components.ProfilePictureView
-            android:id="@+id/profilePictureView"
-            android:layout_width="@dimen/small_profile_picture_size"
-            android:layout_height="@dimen/small_profile_picture_size" />
-
-        <TextView
-            android:id="@+id/nameTextView"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/medium_spacing"
-            android:maxLength="@integer/max_user_nickname_length_chars"
-            android:maxLines="1"
-            android:textAlignment="viewStart"
-            android:ellipsize="end"
-            android:textSize="@dimen/medium_font_size"
-            android:textStyle="bold"
-            android:layout_weight="1"
-            tools:text="Spiderman" />
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml
index bb3cd8a804..c61cc3c843 100644
--- a/app/src/main/res/values/integers.xml
+++ b/app/src/main/res/values/integers.xml
@@ -7,6 +7,5 @@
     <integer name="reaction_scrubber_hide_duration">150</integer>
     <integer name="reaction_scrubber_emoji_reveal_duration_start_delay_factor">10</integer>
 
-    <integer name="max_user_nickname_length_chars">35</integer>
     <integer name="max_group_and_community_name_length_chars">35</integer>
 </resources>
\ No newline at end of file