diff --git a/messages.pot b/messages.pot
index 03d02fd9e29..b3cfa83008b 100644
--- a/messages.pot
+++ b/messages.pot
@@ -1658,12 +1658,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-msgid "survey"
-msgstr ""
-
-msgid "survey_completed"
-msgstr ""
-
 msgid "survey_skip"
 msgstr ""
 
diff --git a/static/css/generated.full.css b/static/css/generated.full.css
index 64a46fc52cb..74ca819abe6 100644
--- a/static/css/generated.full.css
+++ b/static/css/generated.full.css
@@ -346956,14 +346956,6 @@ div[class^="ace_incorrect_hedy_code"] {
     margin-bottom: 0px;
   }
 
-  .md\:ml-4 {
-    margin-left: 1rem;
-  }
-
-  .md\:mr-4 {
-    margin-right: 1rem;
-  }
-
   .md\:block {
     display: block;
   }
diff --git a/templates/class-overview.html b/templates/class-overview.html
index c38b9af7fbc..e46c2e918bf 100644
--- a/templates/class-overview.html
+++ b/templates/class-overview.html
@@ -7,25 +7,10 @@
             <span class="fa fa-arrow-{% if g.dir == " ltr" %}right{% else %}left{% endif %}">&nbsp;</span>
             {{_('go_back')}}
         </button>
-        <div id="survey" data-cy="survey" class="hidden"></div>
         {% if second_teacher %}<h1>{{_('role')}}: {{role}}</h1>{% endif %}
         <div class="flex flex-col md:flex-row items-left md:items-center justify-between">
             <h1>{{ class_info.name }}</h1>
             <div class="flex flex-col md:flex-row gap-2">
-                <div class="items-center gap-2 md:ml-4 md:mr-4 align-middle">
-                    {% if class_info.students > 0 %}
-                    <h2 id="survey_status_button" class="hidden md:block" data-cy="survey_status_button">
-                        {% if questions|length == 0 %}
-                        {{_('survey_completed')}} ✅
-                        {% else %}
-                        <a class="cursor-pointer" hx-post="/for-teachers/load-survey/{{class_info.id}}" hx-target="#survey"
-                            hx-swap="outerHTML">
-                            {{_('survey')}} {{total_questions - questions|length}}/{{total_questions}}
-                        </a>
-                        {% endif %}
-                    </h2>
-                    {% endif %}
-                </div>
                 <button class="green-btn w-fit" id="customize_class_button" data-cy="customize_class_button"
                     onclick="window.location.href = '/for-teachers/customize-class/{{class_info.id}}'">
                     {{_('customize_class')}}
diff --git a/tests/cypress/e2e/for-teacher_page/class_page/other_buttons.cy.js b/tests/cypress/e2e/for-teacher_page/class_page/other_buttons.cy.js
index 64b826bed39..3b0082abf4c 100644
--- a/tests/cypress/e2e/for-teacher_page/class_page/other_buttons.cy.js
+++ b/tests/cypress/e2e/for-teacher_page/class_page/other_buttons.cy.js
@@ -28,29 +28,30 @@ teachers.forEach((teacher) => {
         .should('eq', Cypress.config('baseUrl') + Cypress.env('teachers_page'));
     })
 
-    it('Is able to click on survey button, cancel it, respond to 1 question, then 3 to finish', () => {
-      // cancel survey
-      cy.getDataCy('survey_status_button').click();
-      cy.getDataCy('survey').should("be.visible");
-      cy.getDataCy('cancel_survey').click();
-      cy.getDataCy('survey').should("not.be.visible");
-      // respond to 1 question
-      cy.getDataCy('survey_status_button').click();
-      cy.getDataCy('survey').should("be.visible");
-      cy.getDataCy('input_1').type("test");
-      cy.getDataCy('submit').click();
-      // respond to last 3 questions
-      cy.getDataCy('survey_status_button').click();
-      const surveyInputs = Array.from({length:3},(v, k)=> k+1)
-      cy.wrap(surveyInputs).each((index) => {
-          cy.getDataCy("input_" + index)
-              .type("test")
-              .invoke("val").then((text) => {
-                expect("test").to.equal(text);
-              });
-          });
-      cy.getDataCy('submit').click();
-      cy.getDataCy('survey_status_button').contains("complete");
-    })
+//    Disabling the survey test because it should be used again after the redesign
+//    it('Is able to click on survey button, cancel it, respond to 1 question, then 3 to finish', () => {
+//      // cancel survey
+//      cy.getDataCy('survey_status_button').click();
+//      cy.getDataCy('survey').should("be.visible");
+//      cy.getDataCy('cancel_survey').click();
+//      cy.getDataCy('survey').should("not.be.visible");
+//      // respond to 1 question
+//      cy.getDataCy('survey_status_button').click();
+//      cy.getDataCy('survey').should("be.visible");
+//      cy.getDataCy('input_1').type("test");
+//      cy.getDataCy('submit').click();
+//      // respond to last 3 questions
+//      cy.getDataCy('survey_status_button').click();
+//      const surveyInputs = Array.from({length:3},(v, k)=> k+1)
+//      cy.wrap(surveyInputs).each((index) => {
+//          cy.getDataCy("input_" + index)
+//              .type("test")
+//              .invoke("val").then((text) => {
+//                expect("test").to.equal(text);
+//              });
+//          });
+//      cy.getDataCy('submit').click();
+//      cy.getDataCy('survey_status_button').contains("complete");
+//    })
   });
-});
\ No newline at end of file
+});
diff --git a/translations/ar/LC_MESSAGES/messages.po b/translations/ar/LC_MESSAGES/messages.po
index 452eb171e37..437c6eb0018 100644
--- a/translations/ar/LC_MESSAGES/messages.po
+++ b/translations/ar/LC_MESSAGES/messages.po
@@ -1936,14 +1936,6 @@ msgstr ""
 msgid "surname"
 msgstr "الاسم الأول"
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2714,3 +2706,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/bg/LC_MESSAGES/messages.po b/translations/bg/LC_MESSAGES/messages.po
index 5c20c2e15db..d17c6d18281 100644
--- a/translations/bg/LC_MESSAGES/messages.po
+++ b/translations/bg/LC_MESSAGES/messages.po
@@ -2110,14 +2110,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2922,3 +2914,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/bn/LC_MESSAGES/messages.po b/translations/bn/LC_MESSAGES/messages.po
index cbf109bea1b..0d4b01475c7 100644
--- a/translations/bn/LC_MESSAGES/messages.po
+++ b/translations/bn/LC_MESSAGES/messages.po
@@ -2199,14 +2199,6 @@ msgstr ""
 msgid "surname"
 msgstr "Username"
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -3040,3 +3032,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/ca/LC_MESSAGES/messages.po b/translations/ca/LC_MESSAGES/messages.po
index e6bb3a0b53e..e3e63115cbd 100644
--- a/translations/ca/LC_MESSAGES/messages.po
+++ b/translations/ca/LC_MESSAGES/messages.po
@@ -1690,12 +1690,6 @@ msgstr "Prova de canviar els valors perquè siguin tots text o tots números"
 msgid "surname"
 msgstr "Nom"
 
-msgid "survey"
-msgstr "Enquesta"
-
-msgid "survey_completed"
-msgstr "Enquesta completada"
-
 msgid "survey_skip"
 msgstr "No ho tornis a mostrar"
 
@@ -2397,3 +2391,9 @@ msgstr "El teu programa"
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr "Enquesta"
+
+#~ msgid "survey_completed"
+#~ msgstr "Enquesta completada"
+
diff --git a/translations/cs/LC_MESSAGES/messages.po b/translations/cs/LC_MESSAGES/messages.po
index 7afd863314d..126d67440a2 100644
--- a/translations/cs/LC_MESSAGES/messages.po
+++ b/translations/cs/LC_MESSAGES/messages.po
@@ -2111,14 +2111,6 @@ msgstr ""
 msgid "surname"
 msgstr "Jméno"
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2934,3 +2926,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/cy/LC_MESSAGES/messages.po b/translations/cy/LC_MESSAGES/messages.po
index eed8605d8dc..33b09e9cce9 100644
--- a/translations/cy/LC_MESSAGES/messages.po
+++ b/translations/cy/LC_MESSAGES/messages.po
@@ -2187,14 +2187,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -3022,3 +3014,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/da/LC_MESSAGES/messages.po b/translations/da/LC_MESSAGES/messages.po
index 77de87704e5..b8ade03e5ca 100644
--- a/translations/da/LC_MESSAGES/messages.po
+++ b/translations/da/LC_MESSAGES/messages.po
@@ -2182,14 +2182,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -3005,3 +2997,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/de/LC_MESSAGES/messages.po b/translations/de/LC_MESSAGES/messages.po
index bdfa25800a3..ce2621135e2 100644
--- a/translations/de/LC_MESSAGES/messages.po
+++ b/translations/de/LC_MESSAGES/messages.po
@@ -1843,14 +1843,6 @@ msgstr ""
 msgid "surname"
 msgstr "Vorname"
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2597,3 +2589,9 @@ msgstr "Dein Programm"
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/el/LC_MESSAGES/messages.po b/translations/el/LC_MESSAGES/messages.po
index a6edead3b31..7ad74926a6f 100644
--- a/translations/el/LC_MESSAGES/messages.po
+++ b/translations/el/LC_MESSAGES/messages.po
@@ -1973,14 +1973,6 @@ msgstr ""
 msgid "surname"
 msgstr "Μικρό Όνομα"
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2795,3 +2787,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/en/LC_MESSAGES/messages.po b/translations/en/LC_MESSAGES/messages.po
index 4cfbdfc3064..5390f8a8bbb 100644
--- a/translations/en/LC_MESSAGES/messages.po
+++ b/translations/en/LC_MESSAGES/messages.po
@@ -1687,12 +1687,6 @@ msgstr "Try changing the values to be all text or all numbers"
 msgid "surname"
 msgstr "First Name"
 
-msgid "survey"
-msgstr "Survey"
-
-msgid "survey_completed"
-msgstr "Survey completed"
-
 msgid "survey_skip"
 msgstr "Don't show this again"
 
@@ -2464,3 +2458,9 @@ msgstr "Your program"
 #~ msgid "Delete"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr "Survey"
+
+#~ msgid "survey_completed"
+#~ msgstr "Survey completed"
+
diff --git a/translations/eo/LC_MESSAGES/messages.po b/translations/eo/LC_MESSAGES/messages.po
index 34ca04e7b24..451e39710d3 100644
--- a/translations/eo/LC_MESSAGES/messages.po
+++ b/translations/eo/LC_MESSAGES/messages.po
@@ -1995,14 +1995,6 @@ msgstr ""
 msgid "surname"
 msgstr "Antaŭnomo"
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2784,3 +2776,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/es/LC_MESSAGES/messages.po b/translations/es/LC_MESSAGES/messages.po
index e08a749aebc..1a7b4f193da 100644
--- a/translations/es/LC_MESSAGES/messages.po
+++ b/translations/es/LC_MESSAGES/messages.po
@@ -1691,12 +1691,6 @@ msgstr "Prueba a cambiar los valores para que sean todo texto o todo números"
 msgid "surname"
 msgstr "Nombre"
 
-msgid "survey"
-msgstr "Encuesta"
-
-msgid "survey_completed"
-msgstr "Encuesta finalizada"
-
 msgid "survey_skip"
 msgstr "No vuelvas a mostrar esto"
 
@@ -2407,3 +2401,9 @@ msgstr "Tu programa"
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr "Encuesta"
+
+#~ msgid "survey_completed"
+#~ msgstr "Encuesta finalizada"
+
diff --git a/translations/et/LC_MESSAGES/messages.po b/translations/et/LC_MESSAGES/messages.po
index 5bbc09924ac..17dc7cac1bd 100644
--- a/translations/et/LC_MESSAGES/messages.po
+++ b/translations/et/LC_MESSAGES/messages.po
@@ -2174,14 +2174,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2999,3 +2991,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/fa/LC_MESSAGES/messages.po b/translations/fa/LC_MESSAGES/messages.po
index 9f81d2d3103..8503281b6a9 100644
--- a/translations/fa/LC_MESSAGES/messages.po
+++ b/translations/fa/LC_MESSAGES/messages.po
@@ -2194,14 +2194,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -3033,3 +3025,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/fi/LC_MESSAGES/messages.po b/translations/fi/LC_MESSAGES/messages.po
index 4749e64bb81..7ef710013bf 100644
--- a/translations/fi/LC_MESSAGES/messages.po
+++ b/translations/fi/LC_MESSAGES/messages.po
@@ -2185,14 +2185,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -3019,3 +3011,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/fr/LC_MESSAGES/messages.po b/translations/fr/LC_MESSAGES/messages.po
index 79b72a0e8b7..fdf493f0dd6 100644
--- a/translations/fr/LC_MESSAGES/messages.po
+++ b/translations/fr/LC_MESSAGES/messages.po
@@ -1873,14 +1873,6 @@ msgstr ""
 msgid "surname"
 msgstr "Prénom"
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2642,3 +2634,9 @@ msgstr "Ton programme"
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/fr_CA/LC_MESSAGES/messages.po b/translations/fr_CA/LC_MESSAGES/messages.po
index b6d5b4ca57e..74441fa084a 100644
--- a/translations/fr_CA/LC_MESSAGES/messages.po
+++ b/translations/fr_CA/LC_MESSAGES/messages.po
@@ -2198,14 +2198,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2853,3 +2845,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/fy/LC_MESSAGES/messages.po b/translations/fy/LC_MESSAGES/messages.po
index 26d49b20785..26a3d69d3ee 100644
--- a/translations/fy/LC_MESSAGES/messages.po
+++ b/translations/fy/LC_MESSAGES/messages.po
@@ -2092,14 +2092,6 @@ msgstr ""
 msgid "surname"
 msgstr "Brûkersnamme"
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2924,3 +2916,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/ga/LC_MESSAGES/messages.po b/translations/ga/LC_MESSAGES/messages.po
index deccbb251c1..51cd3ae022b 100644
--- a/translations/ga/LC_MESSAGES/messages.po
+++ b/translations/ga/LC_MESSAGES/messages.po
@@ -1658,12 +1658,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-msgid "survey"
-msgstr ""
-
-msgid "survey_completed"
-msgstr ""
-
 msgid "survey_skip"
 msgstr ""
 
@@ -1967,3 +1961,9 @@ msgstr ""
 #~ msgid "select_tag"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/he/LC_MESSAGES/messages.po b/translations/he/LC_MESSAGES/messages.po
index da0904f15ab..48cae223de0 100644
--- a/translations/he/LC_MESSAGES/messages.po
+++ b/translations/he/LC_MESSAGES/messages.po
@@ -2166,14 +2166,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2990,3 +2982,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/hi/LC_MESSAGES/messages.po b/translations/hi/LC_MESSAGES/messages.po
index 1295520745e..be893be1aa2 100644
--- a/translations/hi/LC_MESSAGES/messages.po
+++ b/translations/hi/LC_MESSAGES/messages.po
@@ -2002,14 +2002,6 @@ msgstr ""
 msgid "surname"
 msgstr "उपयोगकर्ता नाम"
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2814,3 +2806,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/hr/LC_MESSAGES/messages.po b/translations/hr/LC_MESSAGES/messages.po
index 210455375c4..72a8f94d120 100644
--- a/translations/hr/LC_MESSAGES/messages.po
+++ b/translations/hr/LC_MESSAGES/messages.po
@@ -2199,14 +2199,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2824,3 +2816,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/hu/LC_MESSAGES/messages.po b/translations/hu/LC_MESSAGES/messages.po
index aac1eb352e6..c675be5ebd6 100644
--- a/translations/hu/LC_MESSAGES/messages.po
+++ b/translations/hu/LC_MESSAGES/messages.po
@@ -2102,14 +2102,6 @@ msgstr ""
 msgid "surname"
 msgstr "Felhasználónév"
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2935,3 +2927,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/ia/LC_MESSAGES/messages.po b/translations/ia/LC_MESSAGES/messages.po
index 673cb3e8521..c6d27d49fea 100644
--- a/translations/ia/LC_MESSAGES/messages.po
+++ b/translations/ia/LC_MESSAGES/messages.po
@@ -2190,14 +2190,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2899,3 +2891,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/iba/LC_MESSAGES/messages.po b/translations/iba/LC_MESSAGES/messages.po
index 193982baf06..2954861ce7c 100644
--- a/translations/iba/LC_MESSAGES/messages.po
+++ b/translations/iba/LC_MESSAGES/messages.po
@@ -2198,14 +2198,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2856,3 +2848,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/id/LC_MESSAGES/messages.po b/translations/id/LC_MESSAGES/messages.po
index 3eaa88e49e0..44268a3ff32 100644
--- a/translations/id/LC_MESSAGES/messages.po
+++ b/translations/id/LC_MESSAGES/messages.po
@@ -1857,14 +1857,6 @@ msgstr ""
 msgid "surname"
 msgstr "Nama Depan"
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2607,3 +2599,9 @@ msgstr "Program Anda"
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/it/LC_MESSAGES/messages.po b/translations/it/LC_MESSAGES/messages.po
index bbd1dc2f229..8035d9b224c 100644
--- a/translations/it/LC_MESSAGES/messages.po
+++ b/translations/it/LC_MESSAGES/messages.po
@@ -2122,14 +2122,6 @@ msgstr ""
 msgid "surname"
 msgstr "Nome utente"
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2956,3 +2948,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/ja/LC_MESSAGES/messages.po b/translations/ja/LC_MESSAGES/messages.po
index 745219181b2..c2099ed59e6 100644
--- a/translations/ja/LC_MESSAGES/messages.po
+++ b/translations/ja/LC_MESSAGES/messages.po
@@ -2190,14 +2190,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -3017,3 +3009,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/jbo/LC_MESSAGES/messages.po b/translations/jbo/LC_MESSAGES/messages.po
index ace3aaf8e5d..382f6175f62 100644
--- a/translations/jbo/LC_MESSAGES/messages.po
+++ b/translations/jbo/LC_MESSAGES/messages.po
@@ -1658,12 +1658,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-msgid "survey"
-msgstr ""
-
-msgid "survey_completed"
-msgstr ""
-
 msgid "survey_skip"
 msgstr ""
 
@@ -1961,3 +1955,9 @@ msgstr ""
 msgid "your_program"
 msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/kab/LC_MESSAGES/messages.po b/translations/kab/LC_MESSAGES/messages.po
index f79c156aa6b..56bd255fb31 100644
--- a/translations/kab/LC_MESSAGES/messages.po
+++ b/translations/kab/LC_MESSAGES/messages.po
@@ -1808,14 +1808,6 @@ msgstr ""
 msgid "surname"
 msgstr "Isem"
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 msgid "survey_skip"
 msgstr "Ur d-skan ara tikkelt niḍen"
 
@@ -2212,3 +2204,9 @@ msgstr "Ahil-ik·im"
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/kmr/LC_MESSAGES/messages.po b/translations/kmr/LC_MESSAGES/messages.po
index 408e1ef1304..87b67d89b60 100644
--- a/translations/kmr/LC_MESSAGES/messages.po
+++ b/translations/kmr/LC_MESSAGES/messages.po
@@ -2187,14 +2187,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2932,3 +2924,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/kn/LC_MESSAGES/messages.po b/translations/kn/LC_MESSAGES/messages.po
index fb445e7383b..c19829eb19b 100644
--- a/translations/kn/LC_MESSAGES/messages.po
+++ b/translations/kn/LC_MESSAGES/messages.po
@@ -1658,12 +1658,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-msgid "survey"
-msgstr ""
-
-msgid "survey_completed"
-msgstr ""
-
 msgid "survey_skip"
 msgstr ""
 
@@ -1961,3 +1955,9 @@ msgstr ""
 msgid "your_program"
 msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/ko/LC_MESSAGES/messages.po b/translations/ko/LC_MESSAGES/messages.po
index ec0c1446a3e..16e61703a36 100644
--- a/translations/ko/LC_MESSAGES/messages.po
+++ b/translations/ko/LC_MESSAGES/messages.po
@@ -2217,14 +2217,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2875,3 +2867,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/mi/LC_MESSAGES/messages.po b/translations/mi/LC_MESSAGES/messages.po
index ab43f2b3740..8662b89d5c2 100644
--- a/translations/mi/LC_MESSAGES/messages.po
+++ b/translations/mi/LC_MESSAGES/messages.po
@@ -2190,14 +2190,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2830,3 +2822,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/ml/LC_MESSAGES/messages.po b/translations/ml/LC_MESSAGES/messages.po
index 58266e1c353..c467b601e2d 100644
--- a/translations/ml/LC_MESSAGES/messages.po
+++ b/translations/ml/LC_MESSAGES/messages.po
@@ -1658,12 +1658,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-msgid "survey"
-msgstr ""
-
-msgid "survey_completed"
-msgstr ""
-
 msgid "survey_skip"
 msgstr ""
 
@@ -1967,3 +1961,9 @@ msgstr ""
 #~ msgid "select_tag"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/mr/LC_MESSAGES/messages.po b/translations/mr/LC_MESSAGES/messages.po
index 10d2504dfb5..8afbc5b0490 100644
--- a/translations/mr/LC_MESSAGES/messages.po
+++ b/translations/mr/LC_MESSAGES/messages.po
@@ -1658,12 +1658,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-msgid "survey"
-msgstr ""
-
-msgid "survey_completed"
-msgstr ""
-
 msgid "survey_skip"
 msgstr ""
 
@@ -1961,3 +1955,9 @@ msgstr ""
 msgid "your_program"
 msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/ms/LC_MESSAGES/messages.po b/translations/ms/LC_MESSAGES/messages.po
index 1de5fac7108..3cf874aa488 100644
--- a/translations/ms/LC_MESSAGES/messages.po
+++ b/translations/ms/LC_MESSAGES/messages.po
@@ -2198,14 +2198,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2781,3 +2773,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/my/LC_MESSAGES/messages.po b/translations/my/LC_MESSAGES/messages.po
index f051fe6e2ec..4e11ae5e7af 100644
--- a/translations/my/LC_MESSAGES/messages.po
+++ b/translations/my/LC_MESSAGES/messages.po
@@ -1658,12 +1658,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-msgid "survey"
-msgstr ""
-
-msgid "survey_completed"
-msgstr ""
-
 msgid "survey_skip"
 msgstr ""
 
@@ -1961,3 +1955,9 @@ msgstr ""
 msgid "your_program"
 msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/nb_NO/LC_MESSAGES/messages.po b/translations/nb_NO/LC_MESSAGES/messages.po
index 9544d89b787..22cf234354b 100644
--- a/translations/nb_NO/LC_MESSAGES/messages.po
+++ b/translations/nb_NO/LC_MESSAGES/messages.po
@@ -1970,14 +1970,6 @@ msgstr ""
 msgid "surname"
 msgstr "Fornavn"
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2765,3 +2757,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/ne/LC_MESSAGES/messages.po b/translations/ne/LC_MESSAGES/messages.po
index c725ce1bcf1..c6a83414f6f 100644
--- a/translations/ne/LC_MESSAGES/messages.po
+++ b/translations/ne/LC_MESSAGES/messages.po
@@ -2199,14 +2199,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2665,3 +2657,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/nl/LC_MESSAGES/messages.po b/translations/nl/LC_MESSAGES/messages.po
index 51bdd20b6de..8346a2f444c 100644
--- a/translations/nl/LC_MESSAGES/messages.po
+++ b/translations/nl/LC_MESSAGES/messages.po
@@ -1785,12 +1785,6 @@ msgstr ""
 msgid "surname"
 msgstr "Voornaam"
 
-msgid "survey"
-msgstr "Enquête"
-
-msgid "survey_completed"
-msgstr "Enquête afgerond"
-
 msgid "survey_skip"
 msgstr "Laat dit niet meer zien"
 
@@ -2508,3 +2502,9 @@ msgstr "Jouw programma"
 #~ msgid "Delete"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr "Enquête"
+
+#~ msgid "survey_completed"
+#~ msgstr "Enquête afgerond"
+
diff --git a/translations/pa_PK/LC_MESSAGES/messages.po b/translations/pa_PK/LC_MESSAGES/messages.po
index 2e34ceaf051..dffc197aec6 100644
--- a/translations/pa_PK/LC_MESSAGES/messages.po
+++ b/translations/pa_PK/LC_MESSAGES/messages.po
@@ -2183,14 +2183,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2946,3 +2938,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/pap/LC_MESSAGES/messages.po b/translations/pap/LC_MESSAGES/messages.po
index 79e960b144b..7513634d660 100644
--- a/translations/pap/LC_MESSAGES/messages.po
+++ b/translations/pap/LC_MESSAGES/messages.po
@@ -2190,14 +2190,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2842,3 +2834,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/peo/LC_MESSAGES/messages.po b/translations/peo/LC_MESSAGES/messages.po
index 069afb512e9..0b379471e61 100644
--- a/translations/peo/LC_MESSAGES/messages.po
+++ b/translations/peo/LC_MESSAGES/messages.po
@@ -2198,14 +2198,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2778,3 +2770,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/pl/LC_MESSAGES/messages.po b/translations/pl/LC_MESSAGES/messages.po
index 5a7aa866811..14e00037422 100644
--- a/translations/pl/LC_MESSAGES/messages.po
+++ b/translations/pl/LC_MESSAGES/messages.po
@@ -1717,12 +1717,6 @@ msgstr "Spróbuj zmienić wartości na tekst lub liczby"
 msgid "surname"
 msgstr "Imię"
 
-msgid "survey"
-msgstr "Ankieta"
-
-msgid "survey_completed"
-msgstr "Ankieta wypełniona"
-
 msgid "survey_skip"
 msgstr "Nie pokazuj tego ponownie"
 
@@ -2460,3 +2454,9 @@ msgstr "Twój program"
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr "Ankieta"
+
+#~ msgid "survey_completed"
+#~ msgstr "Ankieta wypełniona"
+
diff --git a/translations/pt_BR/LC_MESSAGES/messages.po b/translations/pt_BR/LC_MESSAGES/messages.po
index 39d808829d0..b9f698557fc 100644
--- a/translations/pt_BR/LC_MESSAGES/messages.po
+++ b/translations/pt_BR/LC_MESSAGES/messages.po
@@ -1875,12 +1875,6 @@ msgstr ""
 msgid "surname"
 msgstr "Nome"
 
-msgid "survey"
-msgstr "Pesquisa"
-
-msgid "survey_completed"
-msgstr "Pesquisa completa"
-
 msgid "survey_skip"
 msgstr "Não mostrar novamente"
 
@@ -2657,3 +2651,9 @@ msgstr "Seu programa"
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr "Pesquisa"
+
+#~ msgid "survey_completed"
+#~ msgstr "Pesquisa completa"
+
diff --git a/translations/pt_PT/LC_MESSAGES/messages.po b/translations/pt_PT/LC_MESSAGES/messages.po
index 7d5397b2a6a..a9c98ae8350 100644
--- a/translations/pt_PT/LC_MESSAGES/messages.po
+++ b/translations/pt_PT/LC_MESSAGES/messages.po
@@ -1876,12 +1876,6 @@ msgstr ""
 msgid "surname"
 msgstr "Utilizador"
 
-msgid "survey"
-msgstr "Pesquisa"
-
-msgid "survey_completed"
-msgstr "Pesquisa completa"
-
 msgid "survey_skip"
 msgstr "Não mostrar novamente"
 
@@ -2595,3 +2589,9 @@ msgstr "O seu programa"
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr "Pesquisa"
+
+#~ msgid "survey_completed"
+#~ msgstr "Pesquisa completa"
+
diff --git a/translations/ro/LC_MESSAGES/messages.po b/translations/ro/LC_MESSAGES/messages.po
index 8a31421ed14..2b1e20ea3e4 100644
--- a/translations/ro/LC_MESSAGES/messages.po
+++ b/translations/ro/LC_MESSAGES/messages.po
@@ -2182,14 +2182,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2932,3 +2924,9 @@ msgstr "Programul tău"
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/ru/LC_MESSAGES/messages.po b/translations/ru/LC_MESSAGES/messages.po
index 1e3bc8cff53..bc87b106d2e 100644
--- a/translations/ru/LC_MESSAGES/messages.po
+++ b/translations/ru/LC_MESSAGES/messages.po
@@ -1882,14 +1882,6 @@ msgstr ""
 msgid "surname"
 msgstr "Имя"
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2656,3 +2648,9 @@ msgstr "Ваша программа"
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/sl/LC_MESSAGES/messages.po b/translations/sl/LC_MESSAGES/messages.po
index 1213d560b1a..e82c832d7d9 100644
--- a/translations/sl/LC_MESSAGES/messages.po
+++ b/translations/sl/LC_MESSAGES/messages.po
@@ -2177,14 +2177,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2769,3 +2761,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/sq/LC_MESSAGES/messages.po b/translations/sq/LC_MESSAGES/messages.po
index d9c72b33290..56cfb0225cc 100644
--- a/translations/sq/LC_MESSAGES/messages.po
+++ b/translations/sq/LC_MESSAGES/messages.po
@@ -2185,14 +2185,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2948,3 +2940,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/sr/LC_MESSAGES/messages.po b/translations/sr/LC_MESSAGES/messages.po
index d16305dcfc9..49ff911bfae 100644
--- a/translations/sr/LC_MESSAGES/messages.po
+++ b/translations/sr/LC_MESSAGES/messages.po
@@ -1690,12 +1690,6 @@ msgstr "Покушајте да промените вредности да бу
 msgid "surname"
 msgstr "Име"
 
-msgid "survey"
-msgstr "Анкета"
-
-msgid "survey_completed"
-msgstr "Анкета завршена"
-
 msgid "survey_skip"
 msgstr "Не приказуј ово поново"
 
@@ -2340,3 +2334,9 @@ msgstr "Ваш програм"
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr "Анкета"
+
+#~ msgid "survey_completed"
+#~ msgstr "Анкета завршена"
+
diff --git a/translations/sv/LC_MESSAGES/messages.po b/translations/sv/LC_MESSAGES/messages.po
index 0ecfc476d2f..ee427e1a98a 100644
--- a/translations/sv/LC_MESSAGES/messages.po
+++ b/translations/sv/LC_MESSAGES/messages.po
@@ -1870,14 +1870,6 @@ msgstr ""
 msgid "surname"
 msgstr "Förnamn"
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2633,3 +2625,9 @@ msgstr "Ditt program"
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/sw/LC_MESSAGES/messages.po b/translations/sw/LC_MESSAGES/messages.po
index aa303b4b253..db21416738c 100644
--- a/translations/sw/LC_MESSAGES/messages.po
+++ b/translations/sw/LC_MESSAGES/messages.po
@@ -2129,14 +2129,6 @@ msgstr ""
 msgid "surname"
 msgstr "Jina la mtumiaji"
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2889,3 +2881,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/ta/LC_MESSAGES/messages.po b/translations/ta/LC_MESSAGES/messages.po
index 33cac61106e..9ac958d9c5b 100644
--- a/translations/ta/LC_MESSAGES/messages.po
+++ b/translations/ta/LC_MESSAGES/messages.po
@@ -2192,14 +2192,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2635,3 +2627,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/te/LC_MESSAGES/messages.po b/translations/te/LC_MESSAGES/messages.po
index dc0fcaff5d3..8daabab197d 100644
--- a/translations/te/LC_MESSAGES/messages.po
+++ b/translations/te/LC_MESSAGES/messages.po
@@ -2185,14 +2185,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2945,3 +2937,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/th/LC_MESSAGES/messages.po b/translations/th/LC_MESSAGES/messages.po
index 6c9738a28dd..0b1c0aa4ebd 100644
--- a/translations/th/LC_MESSAGES/messages.po
+++ b/translations/th/LC_MESSAGES/messages.po
@@ -2160,14 +2160,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2922,3 +2914,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/tl/LC_MESSAGES/messages.po b/translations/tl/LC_MESSAGES/messages.po
index 45c351ed999..22c73cdc015 100644
--- a/translations/tl/LC_MESSAGES/messages.po
+++ b/translations/tl/LC_MESSAGES/messages.po
@@ -2187,14 +2187,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2947,3 +2939,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/tn/LC_MESSAGES/messages.po b/translations/tn/LC_MESSAGES/messages.po
index f74122001eb..b2b14a8a4f7 100644
--- a/translations/tn/LC_MESSAGES/messages.po
+++ b/translations/tn/LC_MESSAGES/messages.po
@@ -2200,14 +2200,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2966,3 +2958,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/tr/LC_MESSAGES/messages.po b/translations/tr/LC_MESSAGES/messages.po
index dc36da44d09..f09c923c6c1 100644
--- a/translations/tr/LC_MESSAGES/messages.po
+++ b/translations/tr/LC_MESSAGES/messages.po
@@ -1790,14 +1790,6 @@ msgstr ""
 msgid "surname"
 msgstr "İlk Adınız"
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2537,3 +2529,9 @@ msgstr "Programınız"
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/uk/LC_MESSAGES/messages.po b/translations/uk/LC_MESSAGES/messages.po
index 4185d2b787b..dee39a0ba4d 100644
--- a/translations/uk/LC_MESSAGES/messages.po
+++ b/translations/uk/LC_MESSAGES/messages.po
@@ -1690,12 +1690,6 @@ msgstr "Спробуйте змінити значення, щоб вони бу
 msgid "surname"
 msgstr "Ім'я"
 
-msgid "survey"
-msgstr "Опитування"
-
-msgid "survey_completed"
-msgstr "Опитування завершено"
-
 msgid "survey_skip"
 msgstr "Не показувати це знову"
 
@@ -2424,3 +2418,9 @@ msgstr "Ваша програма"
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr "Опитування"
+
+#~ msgid "survey_completed"
+#~ msgstr "Опитування завершено"
+
diff --git a/translations/ur/LC_MESSAGES/messages.po b/translations/ur/LC_MESSAGES/messages.po
index 7e6e14addac..02760ec472d 100644
--- a/translations/ur/LC_MESSAGES/messages.po
+++ b/translations/ur/LC_MESSAGES/messages.po
@@ -2185,14 +2185,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2951,3 +2943,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/uz/LC_MESSAGES/messages.po b/translations/uz/LC_MESSAGES/messages.po
index fecef77d8ad..b4d7259daff 100644
--- a/translations/uz/LC_MESSAGES/messages.po
+++ b/translations/uz/LC_MESSAGES/messages.po
@@ -2199,14 +2199,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2725,3 +2717,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/vi/LC_MESSAGES/messages.po b/translations/vi/LC_MESSAGES/messages.po
index bd42897767c..56ce5b72610 100644
--- a/translations/vi/LC_MESSAGES/messages.po
+++ b/translations/vi/LC_MESSAGES/messages.po
@@ -2176,14 +2176,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2933,3 +2925,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/translations/zh_Hans/LC_MESSAGES/messages.po b/translations/zh_Hans/LC_MESSAGES/messages.po
index 6b56672358d..b92eb3b99ab 100644
--- a/translations/zh_Hans/LC_MESSAGES/messages.po
+++ b/translations/zh_Hans/LC_MESSAGES/messages.po
@@ -1691,12 +1691,6 @@ msgstr "尝试将值更改为全部文本或全部数字"
 msgid "surname"
 msgstr "名"
 
-msgid "survey"
-msgstr "调研"
-
-msgid "survey_completed"
-msgstr "调研完成"
-
 msgid "survey_skip"
 msgstr "不要再显示这个"
 
@@ -2414,3 +2408,9 @@ msgstr "你的程序"
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr "调研"
+
+#~ msgid "survey_completed"
+#~ msgstr "调研完成"
+
diff --git a/translations/zh_Hant/LC_MESSAGES/messages.po b/translations/zh_Hant/LC_MESSAGES/messages.po
index 8a635f2ab7a..a3d94e16843 100644
--- a/translations/zh_Hant/LC_MESSAGES/messages.po
+++ b/translations/zh_Hant/LC_MESSAGES/messages.po
@@ -2184,14 +2184,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-#, fuzzy
-msgid "survey"
-msgstr ""
-
-#, fuzzy
-msgid "survey_completed"
-msgstr ""
-
 #, fuzzy
 msgid "survey_skip"
 msgstr ""
@@ -2935,3 +2927,9 @@ msgstr ""
 #~ msgid "select_class"
 #~ msgstr ""
 
+#~ msgid "survey"
+#~ msgstr ""
+
+#~ msgid "survey_completed"
+#~ msgstr ""
+
diff --git a/website/for_teachers.py b/website/for_teachers.py
index 8e6ba5d9b9c..556f8df913e 100644
--- a/website/for_teachers.py
+++ b/website/for_teachers.py
@@ -221,14 +221,6 @@ def get_class(self, user, class_id):
             return utils.error_page(error=404, ui_message=gettext("no_such_class"))
 
         session['class_id'] = class_id
-        survey_id = ""
-        description = ""
-        questions = []
-        survey_later = ""
-        total_questions = ""
-
-        if Class.get("students"):
-            survey_id, description, questions, total_questions, survey_later = self.class_survey(class_id)
 
         students = Class.get("students", [])
         invites = []
@@ -273,11 +265,6 @@ def get_class(self, user, class_id):
             javascript_page_options=dict(
                 page="class-overview"
             ),
-            survey_id=survey_id,
-            description=description,
-            questions=questions,
-            total_questions=total_questions,
-            survey_later=survey_later,
             adventure_table={
                 'students': student_overview_table,
                 'adventures': class_adventures_formatted,
@@ -790,7 +777,9 @@ def get_class_customization_page(self, user, class_id):
                 class_id=class_id
             ))
 
-    @route("/load-survey/<class_id>", methods=["POST"])
+    # Disabling the load-survey route until the survey UI is redesigned
+    # Explicitly not removing the code because it should be used again after the redesign
+    # @route("/load-survey/<class_id>", methods=["POST"])
     def load_survey(self, class_id):
         survey_id, description, questions, total_questions, survey_later = self.class_survey(class_id)
         return render_partial('htmx-survey.html', survey_id=survey_id, description=description,