diff --git a/web/templates/compose.hbs b/web/templates/compose.hbs
index f54c3dacc3..f2c98ffb29 100644
--- a/web/templates/compose.hbs
+++ b/web/templates/compose.hbs
@@ -9,10 +9,6 @@
-
- {{t 'Scroll to bottom' }}
- {{tooltip_hotkey_hints "End"}}
-
@@ -21,17 +17,6 @@
id="left_bar_compose_reply_button_big">
{{t 'Compose message' }}
-
- {{t 'Reply to selected message' }}
- {{tooltip_hotkey_hints "R"}}
-
-
- {{t 'Reply to selected conversation' }}
- {{tooltip_hotkey_hints "R"}}
-
-
- {{t 'You are not allowed to send direct messages in this organization.' }}
-
-
- {{t 'New message' }}
- {{tooltip_hotkey_hints "C"}}
-
-
- {{t 'New topic' }}
- {{tooltip_hotkey_hints "C"}}
-
-
- {{t 'New stream message' }}
- {{tooltip_hotkey_hints "C"}}
-
{{#unless embedded }}
@@ -66,10 +39,6 @@
data-tooltip-template-id="new_direct_message_button_tooltip_template">
{{t 'New direct message' }}
-
- {{t 'New direct message' }}
- {{tooltip_hotkey_hints "X"}}
-
{{/unless}}
@@ -84,14 +53,6 @@
-
- {{t 'Cancel compose' }}
- {{tooltip_hotkey_hints "Esc"}}
-
-
- {{t 'Cancel compose and save draft' }}
- {{tooltip_hotkey_hints "Esc"}}
-
@@ -127,14 +88,6 @@
-
- {{t 'Send' }}
- {{tooltip_hotkey_hints "Enter"}}
-
-
- {{t 'Send' }}
- {{tooltip_hotkey_hints "Ctrl" "Enter"}}
-
{{> compose_control_buttons }}
@@ -164,10 +117,3 @@
-
-
-
- {{t "Add global time" }}
- {{t "Everyone sees global times in their own time zone." }}
-
-
diff --git a/web/templates/compose_control_buttons.hbs b/web/templates/compose_control_buttons.hbs
index f3829ee1db..8838acc9ea 100644
--- a/web/templates/compose_control_buttons.hbs
+++ b/web/templates/compose_control_buttons.hbs
@@ -16,10 +16,6 @@
{{t 'Drafts' }}
-
- {{t 'Drafts' }}
- {{tooltip_hotkey_hints "D"}}
-
diff --git a/web/templates/draft.hbs b/web/templates/draft.hbs
index 49c5bd7340..0c5d555864 100644
--- a/web/templates/draft.hbs
+++ b/web/templates/draft.hbs
@@ -36,15 +36,7 @@
-
- {{t 'Restore draft' }}
- {{tooltip_hotkey_hints "Enter"}}
-
-
- {{t 'Delete draft' }}
- {{tooltip_hotkey_hints "Backspace"}}
-
{{rendered_markdown content}}
diff --git a/web/templates/gear_menu.hbs b/web/templates/gear_menu.hbs
index 35fca135df..6a2a16a0dd 100644
--- a/web/templates/gear_menu.hbs
+++ b/web/templates/gear_menu.hbs
@@ -3,10 +3,6 @@
-