diff --git a/Session/Conversations/Settings/ThreadSettingsViewModel.swift b/Session/Conversations/Settings/ThreadSettingsViewModel.swift
index 08ab92ba7..0dba52653 100644
--- a/Session/Conversations/Settings/ThreadSettingsViewModel.swift
+++ b/Session/Conversations/Settings/ThreadSettingsViewModel.swift
@@ -538,7 +538,6 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigatableStateHolder, Ob
                             ),
                             confirmTitle: "leave".localized(),
                             confirmStyle: .danger,
-                            confirmAccessibility: Accessibility(identifier: "Confirm leave"),
                             cancelStyle: .alert_text
                         ),
                         onTap: { [weak self, dependencies] in
diff --git a/SessionUIKit/Components/ConfirmationModal.swift b/SessionUIKit/Components/ConfirmationModal.swift
index 4939fbba3..b219a137b 100644
--- a/SessionUIKit/Components/ConfirmationModal.swift
+++ b/SessionUIKit/Components/ConfirmationModal.swift
@@ -407,7 +407,7 @@ public class ConfirmationModal: Modal, UITextFieldDelegate, UITextViewDelegate {
                 imageViewTapGestureRecognizer.isEnabled = true
         }
         
-        confirmButton.accessibilityIdentifier = (info.confirmAccessibility?.identifier ?? info.confirmTitle)
+        confirmButton.accessibilityIdentifier = info.confirmTitle
         confirmButton.isAccessibilityElement = true
         confirmButton.setTitle(info.confirmTitle, for: .normal)
         confirmButton.setThemeTitleColor(info.confirmStyle, for: .normal)
@@ -415,7 +415,7 @@ public class ConfirmationModal: Modal, UITextFieldDelegate, UITextViewDelegate {
         confirmButton.isHidden = (info.confirmTitle == nil)
         confirmButton.isEnabled = info.confirmEnabled.isValid(with: info)
         
-        cancelButton.accessibilityIdentifier = (info.cancelAccessibility?.identifier ?? info.cancelTitle)
+        cancelButton.accessibilityIdentifier = info.cancelTitle
         cancelButton.isAccessibilityElement = true
         cancelButton.setTitle(info.cancelTitle, for: .normal)
         cancelButton.setThemeTitleColor(info.cancelStyle, for: .normal)
@@ -579,11 +579,9 @@ public extension ConfirmationModal {
         internal let confirmTitle: String?
         let confirmStyle: ThemeValue
         let confirmEnabled: ButtonValidator
-        let confirmAccessibility: Accessibility?
         internal let cancelTitle: String
         let cancelStyle: ThemeValue
         let cancelEnabled: ButtonValidator
-        let cancelAccessibility: Accessibility?
         let hasCloseButton: Bool
         let dismissOnConfirm: Bool
         let dismissType: Modal.DismissType
@@ -600,11 +598,9 @@ public extension ConfirmationModal {
             confirmTitle: String? = nil,
             confirmStyle: ThemeValue = .alert_text,
             confirmEnabled: ButtonValidator = true,
-            confirmAccessibility: Accessibility? = nil,
             cancelTitle: String = SNUIKit.localizedString(for: "cancel"),
             cancelStyle: ThemeValue = .danger,
             cancelEnabled: ButtonValidator = true,
-            cancelAccessibility: Accessibility? = nil,
             hasCloseButton: Bool = false,
             dismissOnConfirm: Bool = true,
             dismissType: Modal.DismissType = .recursive,
@@ -618,11 +614,9 @@ public extension ConfirmationModal {
             self.confirmTitle = confirmTitle
             self.confirmStyle = confirmStyle
             self.confirmEnabled = confirmEnabled
-            self.confirmAccessibility = confirmAccessibility
             self.cancelTitle = cancelTitle
             self.cancelStyle = cancelStyle
             self.cancelEnabled = cancelEnabled
-            self.cancelAccessibility = cancelAccessibility
             self.hasCloseButton = hasCloseButton
             self.dismissOnConfirm = dismissOnConfirm
             self.dismissType = dismissType
@@ -646,11 +640,9 @@ public extension ConfirmationModal {
                 confirmTitle: self.confirmTitle,
                 confirmStyle: self.confirmStyle,
                 confirmEnabled: self.confirmEnabled,
-                confirmAccessibility: self.confirmAccessibility,
                 cancelTitle: self.cancelTitle,
                 cancelStyle: self.cancelStyle,
                 cancelEnabled: self.cancelEnabled,
-                cancelAccessibility: self.cancelAccessibility,
                 hasCloseButton: self.hasCloseButton,
                 dismissOnConfirm: self.dismissOnConfirm,
                 dismissType: self.dismissType,
@@ -670,11 +662,9 @@ public extension ConfirmationModal {
                 lhs.confirmTitle == rhs.confirmTitle &&
                 lhs.confirmStyle == rhs.confirmStyle &&
                 lhs.confirmEnabled.isValid(with: lhs) == rhs.confirmEnabled.isValid(with: rhs) &&
-                lhs.confirmAccessibility == rhs.confirmAccessibility &&
                 lhs.cancelTitle == rhs.cancelTitle &&
                 lhs.cancelStyle == rhs.cancelStyle &&
                 lhs.cancelEnabled.isValid(with: lhs) == rhs.cancelEnabled.isValid(with: rhs) &&
-                lhs.cancelAccessibility == rhs.cancelAccessibility &&
                 lhs.hasCloseButton == rhs.hasCloseButton &&
                 lhs.dismissOnConfirm == rhs.dismissOnConfirm &&
                 lhs.dismissType == rhs.dismissType
@@ -688,11 +678,9 @@ public extension ConfirmationModal {
             confirmTitle.hash(into: &hasher)
             confirmStyle.hash(into: &hasher)
             confirmEnabled.isValid(with: self).hash(into: &hasher)
-            confirmAccessibility?.hash(into: &hasher)
             cancelTitle.hash(into: &hasher)
             cancelStyle.hash(into: &hasher)
             cancelEnabled.isValid(with: self).hash(into: &hasher)
-            cancelAccessibility?.hash(into: &hasher)
             hasCloseButton.hash(into: &hasher)
             dismissOnConfirm.hash(into: &hasher)
             dismissType.hash(into: &hasher)