diff --git a/app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt b/app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt
index f6873d5c5..ea41187ca 100644
--- a/app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt
@@ -203,16 +203,6 @@ class SettingsActivity : BaseActivity() {
         if (currentUser != null) {
             binding.baseUrlText.text = Uri.parse(currentUser!!.baseUrl).host
             setupServerAgeWarning()
-
-            // TODO: fix reauthorize
-            // binding.settingsReauthorize?.addPreferenceClickListener {
-            //     router.pushController(
-            //         RouterTransaction.with(WebViewLoginController(currentUser!!.baseUrl, true))
-            //             .pushChangeHandler(VerticalChangeHandler())
-            //             .popChangeHandler(VerticalChangeHandler())
-            //     )
-            // }
-
             if (currentUser!!.displayName != null) {
                 binding.displayNameText.text = currentUser!!.displayName
             }
@@ -268,9 +258,9 @@ class SettingsActivity : BaseActivity() {
 
     private fun setupPhoneBookIntegration() {
         if (CapabilitiesUtilNew.isPhoneBookIntegrationAvailable(currentUser!!)) {
-            binding.settingsPhoneBookIntegration?.visibility = View.VISIBLE
+            binding.settingsPhoneBookIntegration.visibility = View.VISIBLE
         } else {
-            binding.settingsPhoneBookIntegration?.visibility = View.GONE
+            binding.settingsPhoneBookIntegration.visibility = View.GONE
         }
     }
 
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 5cc4cba81..c292f30e2 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -275,13 +275,6 @@
         apc:cardElevation="0dp"
         apc:mpc_title="@string/nc_settings_advanced_title">
 
-        <!-- TODO: fix reauthorize -->
-<!--        <com.yarolegovich.mp.MaterialStandardPreference-->
-<!--            android:id="@+id/settings_reauthorize"-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            apc:mp_title="@string/nc_settings_reauthorize" />-->
-
         <com.yarolegovich.mp.MaterialStandardPreference
             android:id="@+id/settings_client_cert"
             android:layout_width="match_parent"