diff --git a/ietf/templates/community/customize_display.html b/ietf/templates/community/customize_display.html
index 2061f16e9..57032786a 100644
--- a/ietf/templates/community/customize_display.html
+++ b/ietf/templates/community/customize_display.html
@@ -2,8 +2,6 @@
 {% load origin %}{% origin %}
 {% load bootstrap3 %}
 
-{% bootstrap_messages %}
-
 <form method="post" action="#custom">
   {% csrf_token %}
   {% bootstrap_form display_form %}
diff --git a/ietf/templates/community/manage_clist.html b/ietf/templates/community/manage_clist.html
index 12bc1a045..a6e32521e 100644
--- a/ietf/templates/community/manage_clist.html
+++ b/ietf/templates/community/manage_clist.html
@@ -15,8 +15,6 @@
   {% origin %}
   <h1>{{ cl.long_name }}</h1>
 
-  {% bootstrap_messages %}
-
   <ul class="nav nav-tabs nav-memory" role="tablist">
     <li class="active"><a href="#view" data-toggle="tab">Documents</a></li>
     <li><a href="#documents" data-toggle="tab">Explicitly added</a></li>
diff --git a/ietf/templates/community/public/subscribe.html b/ietf/templates/community/public/subscribe.html
index ce4bd596e..1ad53d026 100644
--- a/ietf/templates/community/public/subscribe.html
+++ b/ietf/templates/community/public/subscribe.html
@@ -16,8 +16,6 @@
   {% else %}
     <h1>Subscribe to {{ cl.long_name }}</h1>
 
-    {% bootstrap_messages %}
-
     <p>Subscribe to the email list for notifications of {% if significant %}significant {% endif %}changes on {{ cl.long_name }}.</p>
 
     <form method="post">
diff --git a/ietf/templates/community/public/unsubscribe.html b/ietf/templates/community/public/unsubscribe.html
index 3ce159077..7f7ad4013 100644
--- a/ietf/templates/community/public/unsubscribe.html
+++ b/ietf/templates/community/public/unsubscribe.html
@@ -18,8 +18,6 @@
   {% else %}
     <h1>Cancel subscription to {{ cl.long_name }}</h1>
 
-    {% bootstrap_messages %}
-
     <p>
       Cancel your subscription to the email list for notifications of {% if significant %}significant {% endif %}changes on {{ cl.long_name }}.
     </p>
diff --git a/ietf/templates/doc/add_comment.html b/ietf/templates/doc/add_comment.html
index 4a20f6654..5f1176953 100644
--- a/ietf/templates/doc/add_comment.html
+++ b/ietf/templates/doc/add_comment.html
@@ -10,8 +10,6 @@
   {% origin %}
   <h1>Add comment<br><small>{{ doc }}</small></h1>
 
-  {% bootstrap_messages %}
-
   <form method="post">
     {% csrf_token %}
     {% bootstrap_form form %}
diff --git a/ietf/templates/doc/ballot/approvaltext.html b/ietf/templates/doc/ballot/approvaltext.html
index a70ab3a42..1e0221fc1 100644
--- a/ietf/templates/doc/ballot/approvaltext.html
+++ b/ietf/templates/doc/ballot/approvaltext.html
@@ -11,8 +11,6 @@
   {% origin %}
   <h1>Approval announcement writeup<br><small><a href="{% url "doc_view" name=doc.canonical_name %}">{{ doc }}</a></small></h1>
 
-  {% bootstrap_messages %}
-
   <form method="post">
     {% csrf_token %}
     {% bootstrap_form approval_text_form %}
diff --git a/ietf/templates/doc/ballot/edit_position.html b/ietf/templates/doc/ballot/edit_position.html
index 29b775c78..f79e0a2d1 100644
--- a/ietf/templates/doc/ballot/edit_position.html
+++ b/ietf/templates/doc/ballot/edit_position.html
@@ -9,8 +9,6 @@
   {% origin %}
   <h1>Change position for {{ ad.plain_name }} regarding <br><small><a href="{% url "doc_view" name=doc.canonical_name %}">{{ doc }}</a></small></h1>
 
-  {% bootstrap_messages %}
-
   <div class="question">{{ ballot.ballot_type.question }}</div>
 
   {% if ballot_deferred %}
diff --git a/ietf/templates/doc/ballot/lastcalltext.html b/ietf/templates/doc/ballot/lastcalltext.html
index a5a62dc7e..ba99e5585 100644
--- a/ietf/templates/doc/ballot/lastcalltext.html
+++ b/ietf/templates/doc/ballot/lastcalltext.html
@@ -11,8 +11,6 @@
   {% origin %}
   <h1>Last call text<br><small><a href="{% url "doc_view" name=doc.canonical_name %}">{{ doc }}</a></small></h1>
 
-  {% bootstrap_messages %}
-
   <form method="post">
     {% csrf_token %}
     {% bootstrap_form last_call_form %}
diff --git a/ietf/templates/doc/ballot/writeupnotes.html b/ietf/templates/doc/ballot/writeupnotes.html
index 390c46898..46dd74d99 100644
--- a/ietf/templates/doc/ballot/writeupnotes.html
+++ b/ietf/templates/doc/ballot/writeupnotes.html
@@ -11,8 +11,6 @@
 
   <h1>Ballot writeup and notes<br><small><a href="{% url "doc_view" name=doc.canonical_name %}">{{ doc }}</a></small></h1>
 
-  {% bootstrap_messages %}
-
   <form method="post">
     {% csrf_token %}
     {% bootstrap_form ballot_writeup_form %}
diff --git a/ietf/templates/doc/change_ad.html b/ietf/templates/doc/change_ad.html
index 510777886..23dd555bd 100644
--- a/ietf/templates/doc/change_ad.html
+++ b/ietf/templates/doc/change_ad.html
@@ -10,8 +10,6 @@
   {% origin %}
   <h1>Change shepherding AD<br><small>{{titletext}}</small></h1>
 
-  {% bootstrap_messages %}
-
   <form enctype="multipart/form-data" method="post">
     {% csrf_token %}
     {% bootstrap_form form %}
diff --git a/ietf/templates/doc/change_shepherd.html b/ietf/templates/doc/change_shepherd.html
index 2feb9c787..03fd856f8 100644
--- a/ietf/templates/doc/change_shepherd.html
+++ b/ietf/templates/doc/change_shepherd.html
@@ -18,8 +18,6 @@
   <p>The shepherd needs to have a Datatracker account. A new account can be
     <a href="{% url "create_account" %}">created here</a>.</p>
 
-  {% bootstrap_messages %}
-
     <form enctype="multipart/form-data" method="post">
       {% csrf_token %}
       {% bootstrap_form form %}
diff --git a/ietf/templates/doc/change_state.html b/ietf/templates/doc/change_state.html
index 42ba91f83..e7538a9e2 100644
--- a/ietf/templates/doc/change_state.html
+++ b/ietf/templates/doc/change_state.html
@@ -10,8 +10,6 @@
   {% origin %}
   <h1>Change state<br><small>{{doc.title}}</small></h1>
 
-  {% bootstrap_messages %}
-
   <p><a class="btn btn-info" href="{{help_url}}">Help on states</a></p>
 
   <form method="post">
diff --git a/ietf/templates/doc/change_title.html b/ietf/templates/doc/change_title.html
index 9fa6aa116..370d3238d 100644
--- a/ietf/templates/doc/change_title.html
+++ b/ietf/templates/doc/change_title.html
@@ -10,8 +10,6 @@
   {% origin %}
   <h1>Change title<br><small>{{ titletext }}</small></h1>
 
-  {% bootstrap_messages %}
-
   <form method="post">
     {% csrf_token %}
     {% bootstrap_form form %}
diff --git a/ietf/templates/doc/charter/action_announcement_text.html b/ietf/templates/doc/charter/action_announcement_text.html
index 750baabe2..73699de60 100644
--- a/ietf/templates/doc/charter/action_announcement_text.html
+++ b/ietf/templates/doc/charter/action_announcement_text.html
@@ -11,8 +11,6 @@
   {% origin %}
   <h1>{{ charter.chartered_group.type.name }} action announcement writeup<br><small>{{ charter.chartered_group.acronym }}</small></h1>
 
-  {% bootstrap_messages %}
-
   <form method="post">
     {% csrf_token %}
     {% bootstrap_form announcement_text_form %}
diff --git a/ietf/templates/doc/charter/ballot_writeupnotes.html b/ietf/templates/doc/charter/ballot_writeupnotes.html
index e70e6e630..a86ebd4d9 100644
--- a/ietf/templates/doc/charter/ballot_writeupnotes.html
+++ b/ietf/templates/doc/charter/ballot_writeupnotes.html
@@ -11,8 +11,6 @@
 
   <h1>Ballot writeup and notes<br><small>{{ charter.chartered_group }}</small></h1>
 
-  {% bootstrap_messages %}
-
   <form method="post">
     {% csrf_token %}
     {% bootstrap_form ballot_writeup_form %}
diff --git a/ietf/templates/doc/charter/change_ad.html b/ietf/templates/doc/charter/change_ad.html
index 672086629..2cee7b18f 100644
--- a/ietf/templates/doc/charter/change_ad.html
+++ b/ietf/templates/doc/charter/change_ad.html
@@ -12,8 +12,6 @@
   {% origin %}
   <h1>Change responsible AD<br><small>{{ charter.canonical_name }}-{{ charter.rev }}</small></h1>
 
-  {% bootstrap_messages %}
-
   <form enctype="multipart/form-data" method="post">
     {% csrf_token %}
     {% bootstrap_form form %}
diff --git a/ietf/templates/doc/charter/change_state.html b/ietf/templates/doc/charter/change_state.html
index 370b02bc5..84f3d92ea 100644
--- a/ietf/templates/doc/charter/change_state.html
+++ b/ietf/templates/doc/charter/change_state.html
@@ -10,8 +10,6 @@
   {% origin %}
   <h1>{{ title }}</h1>
 
-  {% bootstrap_messages %}
-
   {% if not option %}
     <p><a class="btn btn-info" href="{% url "state_help" type="charter" %}">Help on states</a></p>
   {% endif %}
diff --git a/ietf/templates/doc/charter/review_announcement_text.html b/ietf/templates/doc/charter/review_announcement_text.html
index d7feaccbf..f6eda923a 100644
--- a/ietf/templates/doc/charter/review_announcement_text.html
+++ b/ietf/templates/doc/charter/review_announcement_text.html
@@ -11,8 +11,6 @@
   {% origin %}
   <h1>WG Review announcement writeup<br><small>{{ charter.chartered_group.acronym }}</small></h1>
 
-  {% bootstrap_messages %}
-
   <form method="post">
     {% csrf_token %}
     {% bootstrap_form announcement_text_form %}
diff --git a/ietf/templates/doc/charter/submit.html b/ietf/templates/doc/charter/submit.html
index 767f00472..019b49412 100644
--- a/ietf/templates/doc/charter/submit.html
+++ b/ietf/templates/doc/charter/submit.html
@@ -12,8 +12,6 @@
   {% origin %}
   <h1>Charter submission<br><small>{{ group.acronym }} {{ group.type.name }}</small></h1>
 
-  {% bootstrap_messages %}
-
   <p class="alert alert-info">The text will be submitted as <b>charter-ietf-{{ name }}-{{ next_rev }}</b>.</p>
 
   <form enctype="multipart/form-data" method="post">
diff --git a/ietf/templates/doc/conflict_review/approve.html b/ietf/templates/doc/conflict_review/approve.html
index 79f6e9957..581a2fa70 100644
--- a/ietf/templates/doc/conflict_review/approve.html
+++ b/ietf/templates/doc/conflict_review/approve.html
@@ -10,8 +10,6 @@
   {% origin %}
   <h1>Approve {{ review.canonical_name }}</h1>
 
-  {% bootstrap_messages %}
-
   <form method="post">
     {% csrf_token %}
     {% bootstrap_form form %}
diff --git a/ietf/templates/doc/conflict_review/start.html b/ietf/templates/doc/conflict_review/start.html
index 74addca29..d08f1a2cf 100644
--- a/ietf/templates/doc/conflict_review/start.html
+++ b/ietf/templates/doc/conflict_review/start.html
@@ -12,8 +12,6 @@
   {% origin %}
   <h1>Begin IETF conflict review<br><small>{{doc_to_review.canonical_name}}-{{doc_to_review.rev}}</small></h1>
 
-  {% bootstrap_messages %}
-
   {% if user|has_role:"Secretariat" %}
     <p><a class="btn btn-info" href="{% url "state_help" type="conflict-review" %}">Help on states</a></p>
   {% endif %}
diff --git a/ietf/templates/doc/conflict_review/submit.html b/ietf/templates/doc/conflict_review/submit.html
index 2e980bdf0..0610927fc 100644
--- a/ietf/templates/doc/conflict_review/submit.html
+++ b/ietf/templates/doc/conflict_review/submit.html
@@ -12,8 +12,6 @@
   {% origin %}
   <h1>Edit conflict review<br><small>{{ conflictdoc.canonical_name }}-{{ conflictdoc.rev }}</small></h1>
 
-  {% bootstrap_messages %}
-
   <p class="alert alert-info">The text will be submitted as <strong>{{ review.canonical_name }}-{{ next_rev }}</strong></p>
 
   <form enctype="multipart/form-data" method="post">
diff --git a/ietf/templates/doc/draft/change_ad.html b/ietf/templates/doc/draft/change_ad.html
index 44db032e4..1d1f004b0 100644
--- a/ietf/templates/doc/draft/change_ad.html
+++ b/ietf/templates/doc/draft/change_ad.html
@@ -10,8 +10,6 @@
   {% origin %}
   <h1>Change shepherding AD<br><small>{{ doc.name }}-{{ doc.rev }}</small></h1>
 
-  {% bootstrap_messages %}
-
   <form enctype="multipart/form-data" method="post">
     {% csrf_token %}
     {% bootstrap_form form %}
diff --git a/ietf/templates/doc/draft/change_consensus.html b/ietf/templates/doc/draft/change_consensus.html
index 8e42b0cb1..8524c3b99 100644
--- a/ietf/templates/doc/draft/change_consensus.html
+++ b/ietf/templates/doc/draft/change_consensus.html
@@ -10,8 +10,6 @@
   {% origin %}
   <h1>Change consensus<br><small>{{ doc.name }}-{{ doc.rev }}</small></h1>
 
-  {% bootstrap_messages %}
-
   <form method="post">
     {% csrf_token %}
     {% bootstrap_form form %}
diff --git a/ietf/templates/doc/draft/change_iana_state.html b/ietf/templates/doc/draft/change_iana_state.html
index caf2e5615..b4d1f7a6e 100644
--- a/ietf/templates/doc/draft/change_iana_state.html
+++ b/ietf/templates/doc/draft/change_iana_state.html
@@ -10,8 +10,6 @@
   {% origin %}
   <h1>Change IANA state<br><small>{{ doc }}</small></h1>
 
-  {% bootstrap_messages %}
-
   <form method="post">
     {% csrf_token %}
     {% bootstrap_form form %}
diff --git a/ietf/templates/doc/draft/change_intended_status.html b/ietf/templates/doc/draft/change_intended_status.html
index a911f2e69..3b54bd1a1 100644
--- a/ietf/templates/doc/draft/change_intended_status.html
+++ b/ietf/templates/doc/draft/change_intended_status.html
@@ -10,8 +10,6 @@
   {% origin %}
   <h1>Change intended status<br><small>{{ doc }}</small></h1>
 
-  {% bootstrap_messages %}
-
   <form method="post">
     {% csrf_token %}
     {% bootstrap_form form %}
diff --git a/ietf/templates/doc/draft/change_replaces.html b/ietf/templates/doc/draft/change_replaces.html
index 790d20244..d68c35722 100644
--- a/ietf/templates/doc/draft/change_replaces.html
+++ b/ietf/templates/doc/draft/change_replaces.html
@@ -6,8 +6,6 @@
 
 {% block title %}Change documents replaced by {{ doc }}{% endblock %}
 
-{% bootstrap_messages %}
-
 {% block pagehead %}
   <link rel="stylesheet" href="{% static 'select2/select2.css' %}">
   <link rel="stylesheet" href="{% static 'select2-bootstrap-css/select2-bootstrap.min.css' %}">
diff --git a/ietf/templates/doc/draft/change_shepherd_writeup.html b/ietf/templates/doc/draft/change_shepherd_writeup.html
index 621b6bdf0..57bf996a0 100644
--- a/ietf/templates/doc/draft/change_shepherd_writeup.html
+++ b/ietf/templates/doc/draft/change_shepherd_writeup.html
@@ -12,8 +12,6 @@
   {% origin %}
   <h1>Edit shepherd writeup<br><small>{{ doc.canonical_name }}-{{ doc.rev }}</small></h1>
 
-  {% bootstrap_messages %}
-
   <form enctype="multipart/form-data" method="post">
     {% csrf_token %}
     {% bootstrap_form form %}
diff --git a/ietf/templates/doc/draft/change_state.html b/ietf/templates/doc/draft/change_state.html
index 2a3f5a823..2c815e6b5 100644
--- a/ietf/templates/doc/draft/change_state.html
+++ b/ietf/templates/doc/draft/change_state.html
@@ -10,8 +10,6 @@
   {% origin %}
   <h1>Change state<br><small>{{ doc }}</small></h1>
 
-  {% bootstrap_messages %}
-
   <p>
     <a class="btn btn-info" href="{% url "state_help" type="draft-iesg" %}">Help on states</a>
   </p>
diff --git a/ietf/templates/doc/draft/change_stream.html b/ietf/templates/doc/draft/change_stream.html
index 6df3513dd..e1469ba98 100644
--- a/ietf/templates/doc/draft/change_stream.html
+++ b/ietf/templates/doc/draft/change_stream.html
@@ -10,8 +10,6 @@
   {% origin %}
   <h1>Change stream<br><small>{{ doc }}</small></h1>
 
-  {% bootstrap_messages %}
-
   <form method="post">
     {% csrf_token %}
     {% bootstrap_form form %}
diff --git a/ietf/templates/doc/draft/edit_iesg_note.html b/ietf/templates/doc/draft/edit_iesg_note.html
index 177379f81..b6e9e78c2 100644
--- a/ietf/templates/doc/draft/edit_iesg_note.html
+++ b/ietf/templates/doc/draft/edit_iesg_note.html
@@ -10,8 +10,6 @@
   {% origin %}
   <h1>Edit IESG note<br><small>{{ doc.name }}</small></h1>
 
-  {% bootstrap_messages %}
-
   <form method="post">
     {% csrf_token %}
     {% bootstrap_form form %}
diff --git a/ietf/templates/doc/draft/edit_info.html b/ietf/templates/doc/draft/edit_info.html
index 9b00012ef..8802e1209 100644
--- a/ietf/templates/doc/draft/edit_info.html
+++ b/ietf/templates/doc/draft/edit_info.html
@@ -11,8 +11,6 @@
   {% origin %}
   <h1>Edit info<br><small>{{ doc }}</small></h1>
 
-  {% bootstrap_messages %}
-
   <form method="post">
     {% csrf_token %}
     {% bootstrap_form form %}
diff --git a/ietf/templates/doc/draft/make_last_call.html b/ietf/templates/doc/draft/make_last_call.html
index 3a8496e08..4ca230d89 100644
--- a/ietf/templates/doc/draft/make_last_call.html
+++ b/ietf/templates/doc/draft/make_last_call.html
@@ -10,8 +10,6 @@
   {% origin %}
   <h1>Make last call<br><small>{{ doc.name }}</small></h1>
 
-  {% bootstrap_messages %}
-
   <p class="alert alert-info">
     <b>Last call for:</b>
     {{ doc.name }} ({{ doc.group.acronym }}) to {{ doc.intended_std_level.name }}
diff --git a/ietf/templates/doc/draft/request_publication.html b/ietf/templates/doc/draft/request_publication.html
index 44787d4bf..e64d67a83 100644
--- a/ietf/templates/doc/draft/request_publication.html
+++ b/ietf/templates/doc/draft/request_publication.html
@@ -10,8 +10,6 @@
   {% origin %}
   <h1>Request publication<br><small>{{ doc }}</small></h1>
 
-  {% bootstrap_messages %}
-
   <p class="alert alert-info">
     Send a publication request to the RFC Editor for {{ doc }} and move it to the <i>{{ next_state.name }}</i> stream state.
     Please edit the message and remove any parts in brackets you do not
diff --git a/ietf/templates/doc/edit_notify.html b/ietf/templates/doc/edit_notify.html
index 40fea3d51..fc3e39acc 100644
--- a/ietf/templates/doc/edit_notify.html
+++ b/ietf/templates/doc/edit_notify.html
@@ -12,8 +12,6 @@
   {% origin %}
   <h1>Edit notification addresses<br><small>{{titletext}}</small></h1>
 
-  {% bootstrap_messages %}
-
   <form enctype="multipart/form-data" method="post">
     {% csrf_token %}
     {% bootstrap_form form %}
diff --git a/ietf/templates/doc/edit_telechat_date.html b/ietf/templates/doc/edit_telechat_date.html
index b6fcac384..c30063637 100644
--- a/ietf/templates/doc/edit_telechat_date.html
+++ b/ietf/templates/doc/edit_telechat_date.html
@@ -10,8 +10,6 @@
   {% origin %}
   <h1>Set telechat date<br><small>{{ doc.name }} ({{ doc.pages }} page{{ doc.pages|pluralize }})</small></h1>
 
-  {% bootstrap_messages %}
-
   {% for warning in warnings %}
     <div class="alert alert-warning">{{ warning }}</div>
   {% endfor %}
diff --git a/ietf/templates/doc/status_change/approve.html b/ietf/templates/doc/status_change/approve.html
index c03c4a71c..594124551 100644
--- a/ietf/templates/doc/status_change/approve.html
+++ b/ietf/templates/doc/status_change/approve.html
@@ -10,8 +10,6 @@
   {% origin %}
   <h1>Approve<br><small>{{ doc.canonical_name }}</small></h1>
 
-  {% bootstrap_messages %}
-
   <form method="post">
     {% csrf_token %}
     {% bootstrap_formset formset %}
diff --git a/ietf/templates/doc/status_change/last_call.html b/ietf/templates/doc/status_change/last_call.html
index e400081a1..303997deb 100644
--- a/ietf/templates/doc/status_change/last_call.html
+++ b/ietf/templates/doc/status_change/last_call.html
@@ -11,8 +11,6 @@
   {% origin %}
   <h1>Last call text<br><small>{{ doc }}</small></h1>
 
-  {% bootstrap_messages %}
-
   <form class="edit-last-call-text" method="post">
     {% csrf_token %}
     {% bootstrap_form last_call_form %}
diff --git a/ietf/templates/doc/status_change/make_last_call.html b/ietf/templates/doc/status_change/make_last_call.html
index cdfd0f368..dc0f684e5 100644
--- a/ietf/templates/doc/status_change/make_last_call.html
+++ b/ietf/templates/doc/status_change/make_last_call.html
@@ -15,8 +15,6 @@
 
   <h1>Make last call<br><small>{{doc.name}}</small></h1>
 
-  {% bootstrap_messages %}
-
   <div class="form-group">
     <label>Last call text</label>
     <pre>{{ announcement }}</pre>
diff --git a/ietf/templates/doc/status_change/start.html b/ietf/templates/doc/status_change/start.html
index daef2ed99..1faf4101b 100644
--- a/ietf/templates/doc/status_change/start.html
+++ b/ietf/templates/doc/status_change/start.html
@@ -10,8 +10,6 @@
   {% origin %}
   <h1>Begin RFC status change review</h1>
 
-  {% bootstrap_messages %}
-
   <p><a class="btn btn-default" href="{% url "state_help" type="status-change"  %}">Help on states</a></p>
 
   <form class="start-rfc-status-change-review" method="post">
diff --git a/ietf/templates/doc/status_change/submit.html b/ietf/templates/doc/status_change/submit.html
index 73be09d6c..086bf30f7 100644
--- a/ietf/templates/doc/status_change/submit.html
+++ b/ietf/templates/doc/status_change/submit.html
@@ -10,8 +10,6 @@
   {% origin %}
   <h1>Edit status change text<br><small>{{doc.title}}</small></h1>
 
-  {% bootstrap_messages %}
-
   <p>The text will be submitted as <b>{{ doc.canonical_name }}-{{ next_rev }}</b>:</p>
 
   <form enctype="multipart/form-data" method="post">
diff --git a/ietf/templates/group/conclude.html b/ietf/templates/group/conclude.html
index 08ec05096..8d486019a 100644
--- a/ietf/templates/group/conclude.html
+++ b/ietf/templates/group/conclude.html
@@ -10,8 +10,6 @@
   {% origin %}
   <h1>Request closing of {{ group.acronym }} {{ group.type.name }}</h1>
 
-  {% bootstrap_messages %}
-
   <p>
     Please provide instructions regarding the disposition of each
     active Internet-Draft (such as to withdraw the draft, move it to
diff --git a/ietf/templates/group/edit.html b/ietf/templates/group/edit.html
index d7e31f825..acde05c15 100644
--- a/ietf/templates/group/edit.html
+++ b/ietf/templates/group/edit.html
@@ -30,8 +30,6 @@
     {% endif %}
   </h1>
 
-  {% bootstrap_messages %}
-
   <p class="alert alert-info">Note that persons with authorization to manage information, e.g.
     chairs and delegates, need a datatracker account to actually do
     so. New accounts can be <a href="{% url "create_account" %}">created here</a>.</p>
diff --git a/ietf/templates/group/edit_milestones.html b/ietf/templates/group/edit_milestones.html
index 632159a41..509a35cbc 100644
--- a/ietf/templates/group/edit_milestones.html
+++ b/ietf/templates/group/edit_milestones.html
@@ -18,8 +18,6 @@
 
   <noscript>This page depends on Javascript being enabled to work properly.</noscript>
 
-  {% bootstrap_messages %}
-
   <p>Links:
     <a href="{{ group.about_url }}">{{ group.acronym }} {{ group.type.name }}</a>
     {% if group.charter %}
diff --git a/ietf/templates/group/stream_edit.html b/ietf/templates/group/stream_edit.html
index edb462d6b..ede0a77af 100644
--- a/ietf/templates/group/stream_edit.html
+++ b/ietf/templates/group/stream_edit.html
@@ -16,8 +16,6 @@
   {% origin %}
   <h1>Manage {{ group.name }} RFC stream</h1>
 
-  {% bootstrap_messages %}
-
   <p>
     <b>Chair{{ chairs|pluralize }}:</b>
     {% for chair in chairs %}
diff --git a/ietf/templates/ietfauth/testemail.html b/ietf/templates/ietfauth/testemail.html
index a278f0d41..9d6301d8e 100644
--- a/ietf/templates/ietfauth/testemail.html
+++ b/ietf/templates/ietfauth/testemail.html
@@ -10,8 +10,6 @@
   {% origin %}
   <h1>Set up test email address</h1>
 
-  {% bootstrap_messages %}
-
   <p>Since this server is running in test mode, all email to be sent out
     is intercepted and thrown away.</p>
 
diff --git a/ietf/templates/ipr/add_comment.html b/ietf/templates/ipr/add_comment.html
index dd3f2562d..a98d74570 100644
--- a/ietf/templates/ipr/add_comment.html
+++ b/ietf/templates/ipr/add_comment.html
@@ -12,8 +12,6 @@
 
   <p>The comment will be added to the history trail of the disclosure.</p>
 
-  {% bootstrap_messages %}
-
   <form class="add-comment" method="post">
     {% csrf_token %}
 
diff --git a/ietf/templates/ipr/add_email.html b/ietf/templates/ipr/add_email.html
index 819329002..4979f6842 100644
--- a/ietf/templates/ipr/add_email.html
+++ b/ietf/templates/ipr/add_email.html
@@ -12,8 +12,6 @@
 
   <p>The email will be added to the history trail of the disclosure.</p>
 
-  {% bootstrap_messages %}
-
   <form class="add-email" method="post">
     {% csrf_token %}
 
diff --git a/ietf/templates/ipr/details_edit.html b/ietf/templates/ipr/details_edit.html
index ad1976ffa..44db5423f 100644
--- a/ietf/templates/ipr/details_edit.html
+++ b/ietf/templates/ipr/details_edit.html
@@ -64,7 +64,6 @@
     will be posted, but will be marked as "non-compliant".
   </p>
 
-  {% bootstrap_messages %}
 
   <form class="ipr-form form-horizontal show-required" method="post">
     {% csrf_token %}
diff --git a/ietf/templates/ipr/email.html b/ietf/templates/ipr/email.html
index d5066d773..9da638b5d 100644
--- a/ietf/templates/ipr/email.html
+++ b/ietf/templates/ipr/email.html
@@ -14,8 +14,6 @@
   {% origin %}
   <h1>Email submitter<br><small>{{ ipr.title }}</small></h1>
 
-  {% bootstrap_messages %}
-
   <form method="post" class="show-required">
     {% csrf_token %}
 
diff --git a/ietf/templates/ipr/notify.html b/ietf/templates/ipr/notify.html
index e0cc8e7ff..76192fa87 100644
--- a/ietf/templates/ipr/notify.html
+++ b/ietf/templates/ipr/notify.html
@@ -10,8 +10,6 @@
   {% origin %}
   <h1>Send Notification{{ formset|pluralize }}<br><small>{{ ipr }}</small></h1>
 
-  {% bootstrap_messages %}
-
   <form class="send-notification" method="post">
     {% csrf_token %}
 
diff --git a/ietf/templates/ipr/state.html b/ietf/templates/ipr/state.html
index 399280b8b..0709ac55c 100644
--- a/ietf/templates/ipr/state.html
+++ b/ietf/templates/ipr/state.html
@@ -10,8 +10,6 @@
   {% origin %}
   <h1>Change State<br><small>{{ ipr }}</small></h1>
 
-  {% bootstrap_messages %}
-
   <form class="add-comment" method="post">
     {% csrf_token %}
 
diff --git a/ietf/templates/liaisons/add_comment.html b/ietf/templates/liaisons/add_comment.html
index 6debe0f14..85e6c3387 100644
--- a/ietf/templates/liaisons/add_comment.html
+++ b/ietf/templates/liaisons/add_comment.html
@@ -12,8 +12,6 @@
 
   <p>The comment will be added to the history trail of the statement.</p>
 
-  {% bootstrap_messages %}
-
   <form class="add-comment" method="post">
     {% csrf_token %}
 
diff --git a/ietf/templates/liaisons/edit.html b/ietf/templates/liaisons/edit.html
index cc7216cfd..4940353a9 100644
--- a/ietf/templates/liaisons/edit.html
+++ b/ietf/templates/liaisons/edit.html
@@ -23,8 +23,6 @@
 
   <h1>{% if liaison %}Edit liaison: {{ liaison }}{% else %}Send Liaison Statement{% endif %}</h1>
 
-  {% bootstrap_messages %}
-
   {% if form.errors %}
     <div class="alert alert-danger">
       <p>There were errors in the submitted form -- see below. Please correct these and resubmit.</p>
diff --git a/ietf/templates/liaisons/edit_attachment.html b/ietf/templates/liaisons/edit_attachment.html
index 8f11d1ec0..1a0ca2f13 100644
--- a/ietf/templates/liaisons/edit_attachment.html
+++ b/ietf/templates/liaisons/edit_attachment.html
@@ -19,8 +19,6 @@
 
   <h1>Edit liaison attachment</h1>
 
-  {% bootstrap_messages %}
-
   {% if form.errors %}
     <div class="alert alert-danger">
       <p>There were errors in the submitted form -- see below. Please correct these and resubmit.</p>
diff --git a/ietf/templates/registration/change_password.html b/ietf/templates/registration/change_password.html
index 5b434cb19..26321558a 100644
--- a/ietf/templates/registration/change_password.html
+++ b/ietf/templates/registration/change_password.html
@@ -18,8 +18,6 @@
   {% else %}
     <h1>Change password</h1>
 
-    {% bootstrap_messages %}
-
     <p>You can change the password below for your user {{ username }} below.</p>
     <form method="post">
       {% csrf_token %}
diff --git a/ietf/templates/registration/confirm.html b/ietf/templates/registration/confirm.html
index 29d7ba3ae..16ad9b94c 100644
--- a/ietf/templates/registration/confirm.html
+++ b/ietf/templates/registration/confirm.html
@@ -18,8 +18,6 @@
   {% else %}
     <h1>Complete account creation</h1>
 
-    {% bootstrap_messages %}
-
     <p>In order to complete the setup of your account with login name {{ email }}, please choose a password:</p>
     <form method="post">
       {% csrf_token %}
diff --git a/ietf/templates/registration/create.html b/ietf/templates/registration/create.html
index e77836f39..a61f362f0 100644
--- a/ietf/templates/registration/create.html
+++ b/ietf/templates/registration/create.html
@@ -9,8 +9,6 @@
 {% block content %}
   {% origin %}
 
-  {% bootstrap_messages %}
-
   {% if success %}
     <h1>Account created successfully</h1>
     <p>Your account creation request has been successfully received.</p>
diff --git a/ietf/templates/registration/login.html b/ietf/templates/registration/login.html
index b3aec8866..53d2b7037 100644
--- a/ietf/templates/registration/login.html
+++ b/ietf/templates/registration/login.html
@@ -10,8 +10,6 @@
   {% origin %}
   <h1>Sign in</h1>
 
-  {% bootstrap_messages %}
-
   <form method="post">
     {% csrf_token %}
     {% bootstrap_form form %}
diff --git a/ietf/templates/registration/password_reset.html b/ietf/templates/registration/password_reset.html
index 92f1748e6..76f531416 100644
--- a/ietf/templates/registration/password_reset.html
+++ b/ietf/templates/registration/password_reset.html
@@ -17,8 +17,6 @@
   {% else %}
     <h1>Password reset</h1>
 
-    {% bootstrap_messages %}
-
     <p>Please enter an email address associated with the account for which you would like to reset the password.</p>
 
     <form method="post">
diff --git a/ietf/templates/submit/add_preapproval.html b/ietf/templates/submit/add_preapproval.html
index 6f2259f0b..a81fdf293 100644
--- a/ietf/templates/submit/add_preapproval.html
+++ b/ietf/templates/submit/add_preapproval.html
@@ -11,7 +11,6 @@
 
 {% block submit_content %}
   {% origin %}
-  {% bootstrap_messages %}
 
   <h2>Add pre-approval</h2>
 
diff --git a/ietf/templates/submit/edit_submission.html b/ietf/templates/submit/edit_submission.html
index 02e2f8570..0ff71abfd 100644
--- a/ietf/templates/submit/edit_submission.html
+++ b/ietf/templates/submit/edit_submission.html
@@ -15,8 +15,6 @@
 
 {% block submit_content %}
   {% origin %}
-  {% bootstrap_messages %}
-
   <div class="modal fade" id="twopages" tabindex="-1" role="dialog" aria-labelledby="twopageslabel" aria-hidden="true">
     <div class="modal-dialog modal-lg">
       <div class="modal-content">
diff --git a/ietf/templates/submit/search_submission.html b/ietf/templates/submit/search_submission.html
index 8f9f3a2f9..4031f3380 100644
--- a/ietf/templates/submit/search_submission.html
+++ b/ietf/templates/submit/search_submission.html
@@ -8,8 +8,6 @@
 
 {% block submit_content %}
   {% origin %}
-  {% bootstrap_messages %}
-
   <p>
     Please enter the name of the Internet-Draft you wish to view the
     submission status of.
diff --git a/ietf/templates/submit/upload_submission.html b/ietf/templates/submit/upload_submission.html
index 51ee5ee92..a643591f2 100644
--- a/ietf/templates/submit/upload_submission.html
+++ b/ietf/templates/submit/upload_submission.html
@@ -8,8 +8,6 @@
 
 {% block submit_content %}
   {% origin %}
-  {% bootstrap_messages %}
-
   {% if form.shutdown and user|has_role:"Secretariat" %}
   <p class="bg-warning">WARNING: currently in draft submission blackout period</p>
   {% endif %}