diff --git a/docs/userGuide/syntax/extra/quiz.md b/docs/userGuide/syntax/extra/quiz.md
index e605d1ebd4..c0a8cf682c 100644
--- a/docs/userGuide/syntax/extra/quiz.md
+++ b/docs/userGuide/syntax/extra/quiz.md
@@ -1,4 +1,4 @@
-<question has-input>
+<question type="text">
   Q1. Name all different types of volatile memory that exists inside a typical household computer system.
   <div slot="hint"></div>
   <div slot="answer">CPU cache and RAM</div>
@@ -6,7 +6,7 @@
 
 <div>
   <panel header=":computer:" minimized>
-    <question has-input>
+    <question type="text">
       What is the difference between a 32 bit and 64 bit operating system?
   </panel>
 </div>
diff --git a/docs/userGuide/syntax/icons.md b/docs/userGuide/syntax/icons.md
index 82508de781..954fc93618 100644
--- a/docs/userGuide/syntax/icons.md
+++ b/docs/userGuide/syntax/icons.md
@@ -12,12 +12,6 @@ The advantage of font icons over emojis is font icons can be _styled_ to fit you
 </span>
 </include>
 
-<box type="important">
-
-The syntax for icons has changed, and the earlier {%raw%}`{{ prefix_name }}`{%endraw%} syntax has been deprecated. <br>
-Please use the new `:prefix-name:` syntax instead.
-</box>
-
 ###### Using Font Awesome Icons
 1. Decide which icon you want to use from the [list of available icons](https://fontawesome.com/icons?d=gallery&m=free).
 1. Construct the MarkBind name for the selected icon by adding the _type prefix_.
diff --git a/docs/userGuide/syntax/modals.md b/docs/userGuide/syntax/modals.md
index a06a8a9e75..22f0b53da0 100644
--- a/docs/userGuide/syntax/modals.md
+++ b/docs/userGuide/syntax/modals.md
@@ -42,7 +42,7 @@ This is the same <trigger for="modal:loremipsum">trigger</trigger> as last one.
 Name | type | Default | Description
 --- | --- | --- | ---
 header{{slot_info_trigger}} | `String` | `''` | Header of the Modal component. Supports inline markdown text.
-footer <hr style="margin-top:0.2rem; margin-bottom:0" /> <small>modal-footer <br> (deprecated)</small> | {{slot_type_info_trigger}} | empty | Specifying this will override the `ok-text` attribute, and the OK button will not render.
+footer | {{slot_type_info_trigger}} | empty | Specifying this will override the `ok-text` attribute, and the OK button will not render.
 ok-text | `String` | `''` | Text for the OK button.
 effect | `String` | `zoom` | Supports: `zoom`, `fade`.
 id | `String` | | Used by [Trigger](#trigger) to activate the Modal by id.<br>**Note: Ensure id for each Modal is unique.**
diff --git a/docs/userGuide/syntax/questions.md b/docs/userGuide/syntax/questions.md
index ccdfbe307c..d979230713 100644
--- a/docs/userGuide/syntax/questions.md
+++ b/docs/userGuide/syntax/questions.md
@@ -350,13 +350,6 @@ keywords | `String` | `''` | Comma delimited string of keywords or phrases to ma
 threshold | `Number` | `0.5` | Minimum proportion of keywords that have to be matched in the user's answer for the answer to be marked as correct.
 answer{{slot_info_trigger}} | `String` | `''` | The answer or explanation to display when the user clicks the check button.
 
-<box type="important" header="Deprecation notes">
-
-- The old `has-input` attributes translate to `type="text"`, but will be deprecated in a future version.
-- `<question>`s without a `type` (or an unrecognised one) will always be marked correct when placed in quizzes.
-</box>
-
-
 #### Quizzes
 
 You can also build a series of questions out of multiple `<question>` components.
diff --git a/packages/cli/test/functional/test_site_algolia_plugin/expected/index.html b/packages/cli/test/functional/test_site_algolia_plugin/expected/index.html
index dbd0afc5e4..5f1ddade96 100644
--- a/packages/cli/test/functional/test_site_algolia_plugin/expected/index.html
+++ b/packages/cli/test/functional/test_site_algolia_plugin/expected/index.html
@@ -67,7 +67,7 @@
       <button class="btn btn-secondary">Trigger should not have `algolia-no-index` class</button>
     </tooltip>
     <p><strong>Question hint and answer should have algolia-no-index class</strong></p>
-    <question>
+    <question type="checkbox">
       Question should not have `algolia-no-index` class
       <template #hint>
         <div class="algolia-no-index">Hint should have `algolia-no-index` class</div>
diff --git a/packages/cli/test/functional/test_site_algolia_plugin/expected/index.page-vue-render.js b/packages/cli/test/functional/test_site_algolia_plugin/expected/index.page-vue-render.js
index 9e2f35cfbf..4bb4150489 100644
--- a/packages/cli/test/functional/test_site_algolia_plugin/expected/index.page-vue-render.js
+++ b/packages/cli/test/functional/test_site_algolia_plugin/expected/index.page-vue-render.js
@@ -1,7 +1,7 @@
 
     var pageVueRenderFn = function anonymous(
 ) {
-with(this){return _c('div',{attrs:{"id":"app"}},[_c('p'),_m(0),_v(" "),_m(1),_v(" "),_c('dropdown',{staticClass:"algolia-no-index",scopedSlots:_u([{key:"header",fn:function(){return [_v("Dropdown")]},proxy:true}])},[_v(" "),_c('li',[_c('a',{staticClass:"dropdown-item",attrs:{"href":"/"}},[_v("One")])]),_v(" "),_c('li',[_c('a',{staticClass:"dropdown-item",attrs:{"href":"/"}},[_v("Two")])])]),_v(" "),_m(2),_v(" "),_c('modal',{staticClass:"algolia-no-index",attrs:{"id":"modal:trigger_id"},scopedSlots:_u([{key:"header",fn:function(){return [_v("Modal")]},proxy:true}])},[_v("\n  Content should have `algolia-no-index` class\n")]),_v(" "),_c('trigger',{attrs:{"for":"modal:trigger_id"}},[_v("Trigger should not have `algolia-no-index` class")]),_v(" "),_m(3),_v(" "),_c('panel',{staticClass:"algolia-no-index",scopedSlots:_u([{key:"header",fn:function(){return [_c('p',[_v("Panel")])]},proxy:true}])},[_v("\n  Content\n")]),_v(" "),_c('panel',{attrs:{"expanded":""},scopedSlots:_u([{key:"header",fn:function(){return [_c('p',[_v("Panel")])]},proxy:true}])},[_v("\n  Content\n")]),_v(" "),_m(4),_v(" "),_c('popover',{attrs:{"placement":"top"},scopedSlots:_u([{key:"header",fn:function(){return [_v("Title")]},proxy:true},{key:"content",fn:function(){return [_c('div',[_v("Content should have `algolia-no-index` class")])]},proxy:true}])},[_v(" "),_v(" "),_c('button',{staticClass:"btn btn-secondary"},[_v("Trigger should not have `algolia-no-index` class")])]),_v(" "),_c('popover',{attrs:{"placement":"top"},scopedSlots:_u([{key:"content",fn:function(){return [_v("Content should have "),_c('code',{pre:true,attrs:{"class":"hljs inline no-lang"}},[_v("algolia-no-index")]),_v(" class")]},proxy:true},{key:"header",fn:function(){return [_v("Title")]},proxy:true}])},[_v(" "),_c('button',{staticClass:"btn btn-secondary"},[_v("Trigger should not have `algolia-no-index` class")])]),_v(" "),_m(5),_v(" "),_c('tooltip',{attrs:{"placement":"top"},scopedSlots:_u([{key:"content",fn:function(){return [_v("Content should have "),_c('code',{pre:true,attrs:{"class":"hljs inline no-lang"}},[_v("algolia-no-index")]),_v(" class")]},proxy:true}])},[_v(" "),_c('button',{staticClass:"btn btn-secondary"},[_v("Trigger should not have `algolia-no-index` class")])]),_v(" "),_m(6),_v(" "),_c('question',{scopedSlots:_u([{key:"hint",fn:function(){return [_c('div',{staticClass:"algolia-no-index"},[_v("Hint should have `algolia-no-index` class")])]},proxy:true},{key:"answer",fn:function(){return [_c('div',{staticClass:"algolia-no-index"},[_v("Answer should have `algolia-no-index` class")])]},proxy:true}])},[_v("\n  Question should not have `algolia-no-index` class\n  ")]),_v(" "),_m(7),_v(" "),_c('tabs',[_c('tab',{scopedSlots:_u([{key:"header",fn:function(){return [_v("First Tab")]},proxy:true}])},[_v("\n    Content"),_c('br'),_v("Content"),_c('br'),_v("Content"),_c('br'),_v("Content\n  ")]),_v(" "),_c('tab',{staticClass:"algolia-no-index",scopedSlots:_u([{key:"header",fn:function(){return [_v("Second Tab")]},proxy:true}])},[_v("\n    Content"),_c('br'),_v("Content"),_c('br'),_v("Content"),_c('br'),_v("Content\n  ")])],1),_v(" "),_c('tabs',[_c('tab-group',{scopedSlots:_u([{key:"header",fn:function(){return [_v("First Group")]},proxy:true}])},[_v(" "),_c('tab',{scopedSlots:_u([{key:"header",fn:function(){return [_v("First Tab")]},proxy:true}])},[_v("\n      Content"),_c('br'),_v("Content"),_c('br'),_v("Content"),_c('br'),_v("Content\n    ")]),_v(" "),_c('tab',{staticClass:"algolia-no-index",scopedSlots:_u([{key:"header",fn:function(){return [_v("Second Tab")]},proxy:true}])},[_v("\n      Content"),_c('br'),_v("Content"),_c('br'),_v("Content"),_c('br'),_v("Content\n    ")])],1),_v(" "),_c('tab-group',{staticClass:"algolia-no-index",scopedSlots:_u([{key:"header",fn:function(){return [_v("Second Group")]},proxy:true}])},[_v(" "),_c('tab',{scopedSlots:_u([{key:"header",fn:function(){return [_v("First Tab")]},proxy:true}])},[_v("\n      Content"),_c('br'),_v("Content"),_c('br'),_v("Content"),_c('br'),_v("Content\n    ")]),_v(" "),_c('tab',{staticClass:"algolia-no-index",scopedSlots:_u([{key:"header",fn:function(){return [_v("Second Tab")]},proxy:true}])},[_v("\n      Content"),_c('br'),_v("Content"),_c('br'),_v("Content"),_c('br'),_v("Content\n    ")])],1)],1),_v(" "),_c('tabs',[_c('tab-group',{scopedSlots:_u([{key:"header",fn:function(){return [_v("Outer One")]},proxy:true}])},[_v(" "),_c('tab',{scopedSlots:_u([{key:"header",fn:function(){return [_v("First Tab")]},proxy:true}])},[_v("\n      Content"),_c('br'),_v("Content"),_c('br'),_v("Content"),_c('br'),_v("Content\n    ")]),_v(" "),_c('tab',{staticClass:"algolia-no-index",scopedSlots:_u([{key:"header",fn:function(){return [_v("Second Tab")]},proxy:true}])},[_v("\n      Content"),_c('br'),_v("Content"),_c('br'),_v("Content"),_c('br'),_v("Content\n    ")])],1),_v(" "),_c('tab',{scopedSlots:_u([{key:"header",fn:function(){return [_v("Outer Two")]},proxy:true}])},[_v("\n    Content"),_c('br'),_v("Content"),_c('br'),_v("Content"),_c('br'),_v("Content\n  ")])],1),_c('p'),_v(" "),_c('scroll-top-button')],1)}
+with(this){return _c('div',{attrs:{"id":"app"}},[_c('p'),_m(0),_v(" "),_m(1),_v(" "),_c('dropdown',{staticClass:"algolia-no-index",scopedSlots:_u([{key:"header",fn:function(){return [_v("Dropdown")]},proxy:true}])},[_v(" "),_c('li',[_c('a',{staticClass:"dropdown-item",attrs:{"href":"/"}},[_v("One")])]),_v(" "),_c('li',[_c('a',{staticClass:"dropdown-item",attrs:{"href":"/"}},[_v("Two")])])]),_v(" "),_m(2),_v(" "),_c('modal',{staticClass:"algolia-no-index",attrs:{"id":"modal:trigger_id"},scopedSlots:_u([{key:"header",fn:function(){return [_v("Modal")]},proxy:true}])},[_v("\n  Content should have `algolia-no-index` class\n")]),_v(" "),_c('trigger',{attrs:{"for":"modal:trigger_id"}},[_v("Trigger should not have `algolia-no-index` class")]),_v(" "),_m(3),_v(" "),_c('panel',{staticClass:"algolia-no-index",scopedSlots:_u([{key:"header",fn:function(){return [_c('p',[_v("Panel")])]},proxy:true}])},[_v("\n  Content\n")]),_v(" "),_c('panel',{attrs:{"expanded":""},scopedSlots:_u([{key:"header",fn:function(){return [_c('p',[_v("Panel")])]},proxy:true}])},[_v("\n  Content\n")]),_v(" "),_m(4),_v(" "),_c('popover',{attrs:{"placement":"top"},scopedSlots:_u([{key:"header",fn:function(){return [_v("Title")]},proxy:true},{key:"content",fn:function(){return [_c('div',[_v("Content should have `algolia-no-index` class")])]},proxy:true}])},[_v(" "),_v(" "),_c('button',{staticClass:"btn btn-secondary"},[_v("Trigger should not have `algolia-no-index` class")])]),_v(" "),_c('popover',{attrs:{"placement":"top"},scopedSlots:_u([{key:"content",fn:function(){return [_v("Content should have "),_c('code',{pre:true,attrs:{"class":"hljs inline no-lang"}},[_v("algolia-no-index")]),_v(" class")]},proxy:true},{key:"header",fn:function(){return [_v("Title")]},proxy:true}])},[_v(" "),_c('button',{staticClass:"btn btn-secondary"},[_v("Trigger should not have `algolia-no-index` class")])]),_v(" "),_m(5),_v(" "),_c('tooltip',{attrs:{"placement":"top"},scopedSlots:_u([{key:"content",fn:function(){return [_v("Content should have "),_c('code',{pre:true,attrs:{"class":"hljs inline no-lang"}},[_v("algolia-no-index")]),_v(" class")]},proxy:true}])},[_v(" "),_c('button',{staticClass:"btn btn-secondary"},[_v("Trigger should not have `algolia-no-index` class")])]),_v(" "),_m(6),_v(" "),_c('question',{attrs:{"type":"checkbox"},scopedSlots:_u([{key:"hint",fn:function(){return [_c('div',{staticClass:"algolia-no-index"},[_v("Hint should have `algolia-no-index` class")])]},proxy:true},{key:"answer",fn:function(){return [_c('div',{staticClass:"algolia-no-index"},[_v("Answer should have `algolia-no-index` class")])]},proxy:true}])},[_v("\n  Question should not have `algolia-no-index` class\n  ")]),_v(" "),_m(7),_v(" "),_c('tabs',[_c('tab',{scopedSlots:_u([{key:"header",fn:function(){return [_v("First Tab")]},proxy:true}])},[_v("\n    Content"),_c('br'),_v("Content"),_c('br'),_v("Content"),_c('br'),_v("Content\n  ")]),_v(" "),_c('tab',{staticClass:"algolia-no-index",scopedSlots:_u([{key:"header",fn:function(){return [_v("Second Tab")]},proxy:true}])},[_v("\n    Content"),_c('br'),_v("Content"),_c('br'),_v("Content"),_c('br'),_v("Content\n  ")])],1),_v(" "),_c('tabs',[_c('tab-group',{scopedSlots:_u([{key:"header",fn:function(){return [_v("First Group")]},proxy:true}])},[_v(" "),_c('tab',{scopedSlots:_u([{key:"header",fn:function(){return [_v("First Tab")]},proxy:true}])},[_v("\n      Content"),_c('br'),_v("Content"),_c('br'),_v("Content"),_c('br'),_v("Content\n    ")]),_v(" "),_c('tab',{staticClass:"algolia-no-index",scopedSlots:_u([{key:"header",fn:function(){return [_v("Second Tab")]},proxy:true}])},[_v("\n      Content"),_c('br'),_v("Content"),_c('br'),_v("Content"),_c('br'),_v("Content\n    ")])],1),_v(" "),_c('tab-group',{staticClass:"algolia-no-index",scopedSlots:_u([{key:"header",fn:function(){return [_v("Second Group")]},proxy:true}])},[_v(" "),_c('tab',{scopedSlots:_u([{key:"header",fn:function(){return [_v("First Tab")]},proxy:true}])},[_v("\n      Content"),_c('br'),_v("Content"),_c('br'),_v("Content"),_c('br'),_v("Content\n    ")]),_v(" "),_c('tab',{staticClass:"algolia-no-index",scopedSlots:_u([{key:"header",fn:function(){return [_v("Second Tab")]},proxy:true}])},[_v("\n      Content"),_c('br'),_v("Content"),_c('br'),_v("Content"),_c('br'),_v("Content\n    ")])],1)],1),_v(" "),_c('tabs',[_c('tab-group',{scopedSlots:_u([{key:"header",fn:function(){return [_v("Outer One")]},proxy:true}])},[_v(" "),_c('tab',{scopedSlots:_u([{key:"header",fn:function(){return [_v("First Tab")]},proxy:true}])},[_v("\n      Content"),_c('br'),_v("Content"),_c('br'),_v("Content"),_c('br'),_v("Content\n    ")]),_v(" "),_c('tab',{staticClass:"algolia-no-index",scopedSlots:_u([{key:"header",fn:function(){return [_v("Second Tab")]},proxy:true}])},[_v("\n      Content"),_c('br'),_v("Content"),_c('br'),_v("Content"),_c('br'),_v("Content\n    ")])],1),_v(" "),_c('tab',{scopedSlots:_u([{key:"header",fn:function(){return [_v("Outer Two")]},proxy:true}])},[_v("\n    Content"),_c('br'),_v("Content"),_c('br'),_v("Content"),_c('br'),_v("Content\n  ")])],1),_c('p'),_v(" "),_c('scroll-top-button')],1)}
 };
     var pageVueStaticRenderFns = [function anonymous(
 ) {
diff --git a/packages/cli/test/functional/test_site_algolia_plugin/index.md b/packages/cli/test/functional/test_site_algolia_plugin/index.md
index 5d7679fe85..80cdd04af4 100644
--- a/packages/cli/test/functional/test_site_algolia_plugin/index.md
+++ b/packages/cli/test/functional/test_site_algolia_plugin/index.md
@@ -47,7 +47,7 @@
 
 **Question hint and answer should have algolia-no-index class**
 
-<question>
+<question type="checkbox">
   Question should not have `algolia-no-index` class
   <div slot="hint">Hint should have `algolia-no-index` class</div>
   <div slot="answer">Answer should have `algolia-no-index` class</div>
diff --git a/packages/core/src/html/NodeProcessor.ts b/packages/core/src/html/NodeProcessor.ts
index bd842f0800..8234cb3f48 100644
--- a/packages/core/src/html/NodeProcessor.ts
+++ b/packages/core/src/html/NodeProcessor.ts
@@ -13,8 +13,8 @@ import { isMarkdownFileExt } from '../utils/fsUtil';
 import * as logger from '../utils/logger';
 import * as linkProcessor from './linkProcessor';
 import type VariableProcessor from '../variables/VariableProcessor';
-import { warnConflictingAtributesMap, warnDeprecatedAtributesMap } from './warnings';
-import { shiftSlotNodeDeeper, transformOldSlotSyntax, renameSlot } from './vueSlotSyntaxProcessor';
+import { warnConflictingAtributesMap } from './warnings';
+import { shiftSlotNodeDeeper, transformOldSlotSyntax } from './vueSlotSyntaxProcessor';
 import { MdAttributeRenderer } from './MdAttributeRenderer';
 import { MarkdownProcessor } from './MarkdownProcessor';
 import { processScriptAndStyleTag } from './scriptAndStyleTagProcessor';
@@ -157,11 +157,6 @@ export class NodeProcessor {
       cheerio(node).remove();
     } else {
       this.processedModals[node.attribs.id] = true;
-
-      // Transform deprecated slot names; remove when deprecating
-      renameSlot(node, 'modal-header', 'header');
-      renameSlot(node, 'modal-footer', 'footer');
-
       this.mdAttributeRenderer.processModalAttributes(node);
     }
   }
@@ -177,8 +172,7 @@ export class NodeProcessor {
       transformOldSlotSyntax(node);
       shiftSlotNodeDeeper(node);
 
-      // log warnings for deprecated and conflicting attributes
-      if (_.has(warnDeprecatedAtributesMap, node.name)) { warnDeprecatedAtributesMap[node.name](node); }
+      // log warnings for conflicting attributes
       if (_.has(warnConflictingAtributesMap, node.name)) { warnConflictingAtributesMap[node.name](node); }
 
       switch (node.name) {
diff --git a/packages/core/src/html/warnings.ts b/packages/core/src/html/warnings.ts
index 065411fb15..ce9428be6e 100644
--- a/packages/core/src/html/warnings.ts
+++ b/packages/core/src/html/warnings.ts
@@ -1,6 +1,5 @@
 import * as logger from '../utils/logger';
 import { MbNode } from '../utils/node';
-import { getVslotShorthandName } from './vueSlotSyntaxProcessor';
 
 /**
  * Check and warns if element has conflicting attributes.
@@ -24,30 +23,6 @@ function _warnConflictingAttributes(node: MbNode, attribute: string, attrsConfli
   });
 }
 
-/**
- * Check and warns if element has a deprecated slot name
- * @param element Root element to check
- * @param namePairs Object of slot name pairs with each pair in the form deprecated : correct
- */
-function _warnDeprecatedSlotNames(element: MbNode, namePairs: { [name: string]: string }) {
-  if (!(element.children)) {
-    return;
-  }
-  element.children.forEach((child) => {
-    const vslotShorthandName = getVslotShorthandName(child);
-    if (vslotShorthandName) {
-      Object.entries(namePairs)
-        .forEach(([deprecatedName, correctName]) => {
-          if (vslotShorthandName !== deprecatedName) {
-            return;
-          }
-          logger.warn(`${element.name} shorthand slot name '${deprecatedName}' `
-              + `is deprecated and may be removed in the future. Please use '${correctName}'`);
-        });
-    }
-  });
-}
-
 export const warnConflictingAtributesMap: { [attr: string]: (nd: MbNode) => void } = {
   box: (node) => {
     _warnConflictingAttributes(node, 'light', ['seamless']);
@@ -57,12 +32,3 @@ export const warnConflictingAtributesMap: { [attr: string]: (nd: MbNode) => void
     _warnConflictingAttributes(node, 'no-icon', ['icon']);
   },
 };
-
-export const warnDeprecatedAtributesMap: { [attr: string]: (nd: MbNode) => void } = {
-  modal: (node) => {
-    _warnDeprecatedSlotNames(node, {
-      'modal-header': 'header',
-      'modal-footer': 'footer',
-    });
-  },
-};
diff --git a/packages/core/test/unit/html/NodeProcessor.data.ts b/packages/core/test/unit/html/NodeProcessor.data.ts
index 146d0c93bc..102d265111 100644
--- a/packages/core/test/unit/html/NodeProcessor.data.ts
+++ b/packages/core/test/unit/html/NodeProcessor.data.ts
@@ -230,22 +230,6 @@ export const PROCESS_MODAL_OK_TEXT_EXPECTED = `
 </modal>
 `;
 
-// todo remove these once modal-header modal-footer slot names are deprecated fully.
-
-export const PROCESS_MODAL_SLOTS_RENAMING = `
-<modal>
-  <div slot="modal-header">Should be renamed to header</div>
-  <div slot="modal-footer">Should be renamed to footer</div>
-</modal>
-`;
-
-export const PROCESS_MODAL_SLOTS_RENAMING_EXPECTED = `
-<modal>
-  <template #header><div>Should be renamed to header</div></template>
-  <template #footer><div>Should be renamed to footer</div></template>
-</modal>
-`;
-
 /*
  * Tab, tab-group
  */
diff --git a/packages/core/test/unit/html/NodeProcessor.test.ts b/packages/core/test/unit/html/NodeProcessor.test.ts
index 277556c594..989c16df4c 100644
--- a/packages/core/test/unit/html/NodeProcessor.test.ts
+++ b/packages/core/test/unit/html/NodeProcessor.test.ts
@@ -87,10 +87,6 @@ test('processNode processes modal attributes and inserts into dom as slots corre
   processAndVerifyTemplate(testData.PROCESS_MODAL_HEADER,
                            testData.PROCESS_MODAL_HEADER_EXPECTED);
 
-  // todo remove these once 'modal-header' / 'modal-footer' for modal is fully deprecated
-  processAndVerifyTemplate(testData.PROCESS_MODAL_SLOTS_RENAMING,
-                           testData.PROCESS_MODAL_SLOTS_RENAMING_EXPECTED);
-
   // when the ok-text attr is set, footer shouldn't be disabled and ok-only attr should be added
   processAndVerifyTemplate(testData.PROCESS_MODAL_OK_TEXT,
                            testData.PROCESS_MODAL_OK_TEXT_EXPECTED);
diff --git a/packages/vue-components/src/__tests__/Questions.spec.js b/packages/vue-components/src/__tests__/Questions.spec.js
index f6e5b1646d..d6d921872e 100644
--- a/packages/vue-components/src/__tests__/Questions.spec.js
+++ b/packages/vue-components/src/__tests__/Questions.spec.js
@@ -600,43 +600,3 @@ describe('Text Questions', () => {
     expect(wrapper.element).toMatchSnapshot();
   });
 });
-
-// TODO deprecate this
-describe('Typeless Questions', () => {
-  test('of answered with answer, header, shown hint renders correctly', async () => {
-    const wrapper = mount(Question, {
-      slots: {
-        default: 'Question content',
-        header: 'Typeless question header',
-        answer: 'Typeless question answer',
-        hint: 'Typeless question hint',
-      },
-      provide: DEFAULT_INJECTIONS,
-      stubs: DEFAULT_STUBS,
-    });
-
-    // click 'check'
-    await wrapper.find('button.btn-primary').trigger('click');
-    // click 'hint'
-    await wrapper.find('button.btn-success').trigger('click');
-
-    expect(wrapper.element).toMatchSnapshot();
-  });
-
-  test('of answered with answer, header without hint renders correctly', async () => {
-    const wrapper = mount(Question, {
-      slots: {
-        default: 'Question content',
-        header: 'Typeless question header',
-        answer: 'Typeless question answer',
-      },
-      provide: DEFAULT_INJECTIONS,
-      stubs: DEFAULT_STUBS,
-    });
-
-    // click 'check'
-    await wrapper.find('button.btn-primary').trigger('click');
-
-    expect(wrapper.element).toMatchSnapshot();
-  });
-});
diff --git a/packages/vue-components/src/__tests__/__snapshots__/Questions.spec.js.snap b/packages/vue-components/src/__tests__/__snapshots__/Questions.spec.js.snap
index 30fc03092f..2e58b97fe6 100644
--- a/packages/vue-components/src/__tests__/__snapshots__/Questions.spec.js.snap
+++ b/packages/vue-components/src/__tests__/__snapshots__/Questions.spec.js.snap
@@ -2709,7 +2709,7 @@ exports[`Mcq Questions and QOptions of unanswered with shown hint and header ren
 exports[`Text Questions of answered correctly with answer without header, hint, keywords renders correctly 1`] = `
 <transition-stub>
   <div
-    class="card question"
+    class="card question shake"
   >
     <!---->
      
@@ -2722,26 +2722,53 @@ exports[`Text Questions of answered correctly with answer without header, hint,
       >
         <textarea
           class="form-control"
-          disabled="disabled"
         />
          
-        <div>
-          <hr />
-           
-          <!---->
-        </div>
+        <!---->
       </div>
        
-      <div
-        class="answer"
-      >
-        text question answer
-      </div>
+      <!---->
        
       <!---->
     </div>
      
-    <!---->
+    <div
+      class="card-footer alert-light border-top border-light text-dark"
+    >
+      <i
+        class="fa fa-times text-danger border-danger result-icon"
+      />
+       
+      <transition-group-stub
+        class="float-end"
+        name="q-btn"
+        tag="div"
+      >
+        <!---->
+         
+        <!---->
+         
+        <!---->
+         
+        <button
+          class="btn btn-info q-btn ms-1"
+          type="button"
+        >
+          
+          Show
+        
+        </button>
+         
+        <button
+          class="btn btn-primary q-btn ms-1"
+          type="button"
+        >
+          
+          Retry
+        
+        </button>
+      </transition-group-stub>
+    </div>
   </div>
 </transition-stub>
 `;
@@ -3048,70 +3075,3 @@ exports[`Text Questions of unanswered with shown hint, header without answer ren
   </div>
 </transition-stub>
 `;
-
-exports[`Typeless Questions of answered with answer, header without hint renders correctly 1`] = `
-<transition-stub>
-  <div
-    class="card question"
-  >
-    <div
-      class="card-header alert-light border-bottom border-light text-dark"
-    >
-      Typeless question header
-    </div>
-     
-    <div
-      class="card-body"
-    >
-      Question content 
-      <!---->
-       
-      <div
-        class="answer"
-      >
-        Typeless question answer
-      </div>
-       
-      <!---->
-    </div>
-     
-    <!---->
-  </div>
-</transition-stub>
-`;
-
-exports[`Typeless Questions of answered with answer, header, shown hint renders correctly 1`] = `
-<transition-stub>
-  <div
-    class="card question"
-  >
-    <div
-      class="card-header alert-light border-bottom border-light text-dark"
-    >
-      Typeless question header
-    </div>
-     
-    <div
-      class="card-body"
-    >
-      Question content 
-      <!---->
-       
-      <div
-        class="answer"
-      >
-        Typeless question answer
-      </div>
-       
-      <box-stub
-        class="mb-0 mt-3"
-        type="tip"
-      >
-        Typeless question hint
-      </box-stub>
-    </div>
-     
-    <!---->
-  </div>
-</transition-stub>
-`;
diff --git a/packages/vue-components/src/questions/Question.vue b/packages/vue-components/src/questions/Question.vue
index 09efb3d710..1da3711f1b 100644
--- a/packages/vue-components/src/questions/Question.vue
+++ b/packages/vue-components/src/questions/Question.vue
@@ -1,5 +1,4 @@
 <template>
-  <!-- TODO deprecate all isValidQuestionType checks -->
   <transition :name="questions ? 'question' : null" @after-leave="showNextQuestion">
     <div v-if="active" :class="['card', 'question', shakeClass, addClass]">
       <div v-if="$scopedSlots.header" class="card-header alert-light border-bottom border-light text-dark">
@@ -30,11 +29,7 @@
             </strong>
           </div>
         </div>
-        <!--
-          Gracefully deprecate invalid question types:
-          This allows the old "answer" slot to show for invalid question types, in addition to text questions
-        -->
-        <div v-if="qState.answered && !isMcqOrCheckboxQuestion() && !isBlanksQuestion()" class="answer">
+        <div v-if="qState.answered && isTextQuestion()" class="answer">
           <slot name="answer"></slot>
         </div>
 
@@ -48,28 +43,19 @@
         </box>
       </div>
 
-      <!--
-        Gracefully deprecate invalid question types (isValidQuestionType):
-        This removes the footer for invalid question types,
-        where both the hint and check button has been clicked
-      -->
+      <!-- This removes the footer for questions where both the hint and check button has been clicked -->
       <div
         v-if="showCardFooter"
         class="card-footer alert-light border-top border-light text-dark"
       >
-        <!--
-          Gracefully deprecate invalid question types (isValidQuestionType):
-          This hides the success / wrong circle for invalid question types
-        -->
         <i
-          v-if="qState.state === 1 && isValidTypeAndNotTextWithoutKeywords()"
+          v-if="qState.state === 1"
           class="fa fa-times text-danger border-danger result-icon"
         ></i>
         <i
-          v-else-if="qState.state === 2 && isValidTypeAndNotTextWithoutKeywords()"
+          v-else-if="qState.state === 2"
           class="fa fa-check text-success border-success result-icon"
         ></i>
-
         <transition-group
           name="q-btn"
           tag="div"
@@ -84,9 +70,8 @@
           >
             Hint
           </button>
-          <!-- Gracefully deprecate invalid question types without answers -->
           <button
-            v-if="qState.state === 0 && !(!isValidTypeAndNotTextWithoutKeywords() && !$scopedSlots.answer)"
+            v-if="qState.state === 0 && !(isTextWithoutKeywords() && !$scopedSlots.answer)"
             key="check"
             type="button"
             class="btn btn-primary q-btn ms-1"
@@ -145,10 +130,6 @@ export default {
     },
 
     // Text question specific props
-    hasInput: { // Todo deprecate this
-      type: Boolean,
-      default: false,
-    },
     keywords: {
       type: String,
       default: '',
@@ -174,9 +155,8 @@ export default {
     showCardFooter() {
       // Hide the card footer when 'there are no more buttons to click',
       // and the tick / cross circle is not shown
-      const isInvalidTypeOrTextWithoutKeyword = !this.isValidTypeAndNotTextWithoutKeywords();
       const isHintNotProvidedOrIsShown = !this.$scopedSlots.hint || this.showHint;
-      return !(isInvalidTypeOrTextWithoutKeyword
+      return !(this.isTextWithoutKeywords()
         && isHintNotProvidedOrIsShown
         && this.qState.answered
         && !this.questions);
@@ -237,13 +217,10 @@ export default {
       return this.type === 'blanks';
     },
     isTextQuestion() {
-      return this.type === 'text' || this.hasInput;
+      return this.type === 'text';
     },
-    isValidQuestionType() {
-      return this.isMcqOrCheckboxQuestion() || this.isBlanksQuestion() || this.isTextQuestion();
-    },
-    isValidTypeAndNotTextWithoutKeywords() {
-      return this.isValidQuestionType() && !(this.isTextQuestion() && !this.keywords);
+    isTextWithoutKeywords() {
+      return this.isTextQuestion() && !this.keywords;
     },
     shakeCard() {
       this.shakeClass = 'shake';
@@ -301,12 +278,6 @@ export default {
       }
     },
     checkTextAnswer(markAsAnsweredIfWrong) {
-      // Todo deprecate this guard clause
-      if (!this.keywords.length) {
-        this.markAsCorrect();
-        return;
-      }
-
       const lowerCasedText = this.textareaText.toLowerCase();
       const keywords = this.keywordsSplitTrimmed();