diff --git a/client/admin/category-reports.js b/client/admin/category-reports.js
index 6e484cab..0266f4cd 100644
--- a/client/admin/category-reports.js
+++ b/client/admin/category-reports.js
@@ -54,7 +54,6 @@ function TossupCard({
     const reason = tossup.reports.map(report => report.description).join('; ') || 'None given';
     document.getElementById('report-reason').value = reason;
   }
-  const powerParts = tossup.question.split('(*)');
   return /*#__PURE__*/React.createElement("div", {
     className: "card my-2"
   }, /*#__PURE__*/React.createElement("div", {
@@ -68,13 +67,13 @@ function TossupCard({
     className: "card-body"
   }, /*#__PURE__*/React.createElement("span", {
     dangerouslySetInnerHTML: {
-      __html: powerParts.length > 1 ? '<b>' + powerParts[0] + '(*)</b>' + powerParts[1] : tossup.question
+      __html: tossup.question
     }
   }), /*#__PURE__*/React.createElement("hr", {
     className: "my-3"
   }), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("b", null, "ANSWER:"), " ", /*#__PURE__*/React.createElement("span", {
     dangerouslySetInnerHTML: {
-      __html: tossup?.formatted_answer ?? tossup.answer
+      __html: tossup?.answer
     }
   }))), /*#__PURE__*/React.createElement("div", {
     className: "card-footer clickable",
@@ -102,7 +101,7 @@ function BonusCard({
   }
   function getBonusPartLabel(index, defaultValue = 10, defaultDifficulty = '') {
     const value = bonus.values ? bonus.values[index] ?? defaultValue : defaultValue;
-    const difficulty = bonus.difficulties ? bonus.difficulties[index] ?? defaultDifficulty : defaultDifficulty;
+    const difficulty = bonus.difficultyModifiers ? bonus.difficultyModifiers[index] ?? defaultDifficulty : defaultDifficulty;
     return `[${value}${difficulty}]`;
   }
   function onClick() {
@@ -127,7 +126,7 @@ function BonusCard({
     key: `${bonus._id}-${i}`
   }, /*#__PURE__*/React.createElement("hr", null), /*#__PURE__*/React.createElement("p", null, /*#__PURE__*/React.createElement("span", null, getBonusPartLabel(i), " "), /*#__PURE__*/React.createElement("span", null, bonus.parts[i])), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("b", null, "ANSWER: "), /*#__PURE__*/React.createElement("span", {
     dangerouslySetInnerHTML: {
-      __html: (bonus?.formatted_answers ?? bonus.answers)[i]
+      __html: bonus?.answers[i]
     }
   }))))), /*#__PURE__*/React.createElement("div", {
     className: "card-footer clickable",
diff --git a/client/admin/category-reports.jsx b/client/admin/category-reports.jsx
index 15f9b3f2..1d18dbe2 100644
--- a/client/admin/category-reports.jsx
+++ b/client/admin/category-reports.jsx
@@ -59,8 +59,6 @@ function TossupCard({ tossup }) {
         document.getElementById('report-reason').value = reason;
     }
 
-    const powerParts = tossup.question.split('(*)');
-
     return (
         <div className="card my-2">
             <div className="card-header d-flex justify-content-between clickable" data-bs-toggle="collapse" data-bs-target={`#question-${_id}`}>
@@ -73,13 +71,9 @@ function TossupCard({ tossup }) {
             </div>
             <div className="card-container collapse show" id={`question-${_id}`}>
                 <div className="card-body">
-                    <span dangerouslySetInnerHTML={{
-                        __html: powerParts.length > 1 ? '<b>' + powerParts[0] + '(*)</b>' + powerParts[1] : tossup.question,
-                    }}></span>
+                    <span dangerouslySetInnerHTML={{ __html: tossup.question }}></span>
                     <hr className="my-3"></hr>
-                    <div><b>ANSWER:</b> <span dangerouslySetInnerHTML={{
-                        __html: tossup?.formatted_answer ?? tossup.answer,
-                    }}></span></div>
+                    <div><b>ANSWER:</b> <span dangerouslySetInnerHTML={{ __html: tossup?.answer }}></span></div>
                 </div>
                 <div className="card-footer clickable" onClick={onClick} id={`fix-category-${_id}`} data-bs-toggle="modal" data-bs-target="#fix-category-modal">
                     <small className="text-muted">{packetName ? 'Packet ' + packetName : <span>&nbsp;</span>}</small>
@@ -105,7 +99,7 @@ function BonusCard({ bonus }) {
 
     function getBonusPartLabel(index, defaultValue = 10, defaultDifficulty = '') {
         const value = bonus.values ? (bonus.values[index] ?? defaultValue) : defaultValue;
-        const difficulty = bonus.difficulties ? (bonus.difficulties[index] ?? defaultDifficulty) : defaultDifficulty;
+        const difficulty = bonus.difficultyModifiers ? (bonus.difficultyModifiers[index] ?? defaultDifficulty) : defaultDifficulty;
         return `[${value}${difficulty}]`;
     }
 
@@ -140,7 +134,7 @@ function BonusCard({ bonus }) {
                             </p>
                             <div>
                                 <b>ANSWER: </b>
-                                <span dangerouslySetInnerHTML={{ __html: (bonus?.formatted_answers ?? bonus.answers)[i] }}></span>
+                                <span dangerouslySetInnerHTML={{ __html: bonus?.answers[i] }}></span>
                             </div>
                         </div>,
                     )}
diff --git a/client/admin/geoword/compare.js b/client/admin/geoword/compare.js
index 5522fb79..57ae55fb 100644
--- a/client/admin/geoword/compare.js
+++ b/client/admin/geoword/compare.js
@@ -127,7 +127,7 @@ document.getElementById('form').addEventListener('submit', event => {
                         <div><b>Given answer:</b> ${escapeHTML(myBuzz.givenAnswer)}</div>
                     </div>
                     <div class="col-6">
-                        <div><b>Answer:</b> ${removeParentheses(myBuzz.formatted_answer ?? myBuzz.answer)}</div>
+                        <div><b>Answer:</b> ${removeParentheses(myBuzz.answer)}</div>
                         <div><b>Celerity:</b> ${(opponentBuzz.celerity ?? 0.0).toFixed(3)}</div>
                         <div><b>Points:</b> ${opponentBuzz.points}</div>
                         <div><b>Given answer:</b> ${escapeHTML(opponentBuzz.givenAnswer)}</div>
diff --git a/client/admin/geoword/protests.js b/client/admin/geoword/protests.js
index c9a2bc4e..a508c813 100644
--- a/client/admin/geoword/protests.js
+++ b/client/admin/geoword/protests.js
@@ -15,7 +15,7 @@ fetch('/api/admin/geoword/protests?' + new URLSearchParams({ packetName, divisio
             const { questionNumber } = tossup;
             innerHTML += `<div>${tossup.questionNumber}. ${tossup.question}</div>`;
             // innerHTML += '<hr class="my-3"></hr>';
-            innerHTML += `<div>ANSWER: ${tossup.formatted_answer ?? tossup.answer}</div>`;
+            innerHTML += `<div>ANSWER: ${tossup.answer}</div>`;
             innerHTML += `<p>&lt;${tossup.category} / ${tossup.subcategory}&gt;</p>`;
 
             if (protests.filter(protest => protest.questionNumber === questionNumber).length === 0) {
@@ -55,7 +55,7 @@ fetch('/api/admin/geoword/protests?' + new URLSearchParams({ packetName, divisio
             a.addEventListener('click', () => {
                 document.getElementById('resolve-protest-id').value = a.id;
                 document.getElementById('resolve-protest-given-answer').value = document.getElementById(`given-answer-${a.id}`).textContent;
-                document.getElementById('resolve-protest-actual-answer').innerHTML = packet[parseInt(a.attributes.question.value) - 1].formatted_answer;
+                document.getElementById('resolve-protest-actual-answer').innerHTML = packet[parseInt(a.attributes.question.value) - 1].answer;
             });
         });
     });
diff --git a/client/admin/geoword/stats.js b/client/admin/geoword/stats.js
index 4f6f2bac..3140b08b 100644
--- a/client/admin/geoword/stats.js
+++ b/client/admin/geoword/stats.js
@@ -19,7 +19,7 @@ fetch('/api/admin/geoword/stats?' + new URLSearchParams({ packetName, division }
                     <div><b>#${stats[i].tossup.questionNumber}</b></div>
                     <div><b>Times heard:</b> ${stats[i].timesHeard}</div>
                     <div><b>Number correct:</b> ${stats[i].numberCorrect}</div>
-                    <div><b>Answer:</b> ${stats[i].tossup.formatted_answer}</div>
+                    <div><b>Answer:</b> ${stats[i].tossup.answer}</div>
                 </div>
                 <div class="col-6">
                     <div><b>Best buzz:</b> ${stats[i].bestUsername}</div>
diff --git a/client/api-docs/schemas.html b/client/api-docs/schemas.html
index db5d0273..713a9922 100644
--- a/client/api-docs/schemas.html
+++ b/client/api-docs/schemas.html
@@ -159,7 +159,7 @@ <h4 class="mt-4 md-2" id="tossup"><code>Tossup</code></h4>
                 </li>
                 <li class="list-group-item">
                     <div>
-                        <code>formatted_answer</code><code class="text-muted">: string</code>
+                        <code>answer</code><code class="text-muted">: string</code>
                         <code class="text-muted float-end fw-semibold text-decoration-underline">optional</code>
                     </div>
                     <div>The answerline, formatted with HTML.</div>
@@ -290,7 +290,7 @@ <h4 class="mt-4 md-2" id="bonus"><code>Bonus</code></h4>
                 </li>
                 <li class="list-group-item">
                     <div>
-                        <code>formatted_answers</code><code class="text-muted">: [string, string, string]</code>
+                        <code>answers</code><code class="text-muted">: [string, string, string]</code>
                         <code class="text-muted float-end fw-semibold text-decoration-underline">optional</code>
                     </div>
                     <div>The answerlines, formatted with HTML.</div>
diff --git a/client/database/index.js b/client/database/index.js
index 5fc1bf30..0bd6ff9c 100644
--- a/client/database/index.js
+++ b/client/database/index.js
@@ -22,7 +22,7 @@ function escapeCSVString(string) {
   return `"${string.replace(/"/g, '""').replace(/\n/g, '\\n')}"`;
 }
 function downloadTossupsAsCSV(tossups, filename = 'tossups.csv') {
-  const header = ['_id', 'set.name', 'packet.number', 'number', 'question', 'answer', 'formatted_answer', 'category', 'subcategory', 'alternate_subcategory', 'difficulty', 'set._id', 'packet._id', 'createdAt', 'updatedAt'];
+  const header = ['_id', 'set.name', 'packet.number', 'number', 'question', 'answer', 'answer', 'category', 'subcategory', 'alternate_subcategory', 'difficulty', 'set._id', 'packet._id', 'createdAt', 'updatedAt'];
   let csvdata = header.join(',') + '\n';
   for (const tossup of tossups) {
     for (const key of header) {
@@ -47,7 +47,7 @@ function downloadTossupsAsCSV(tossups, filename = 'tossups.csv') {
   hiddenElement.click();
 }
 function downloadBonusesAsCSV(bonuses, filename = 'bonuses.csv') {
-  const header = ['_id', 'set.name', 'packet.number', 'number', 'leadin', 'parts.0', 'parts.1', 'parts.2', 'answers.0', 'answers.1', 'answers.2', 'formatted_answers.0', 'formatted_answers.1', 'formatted_answers.2', 'category', 'subcategory', 'alternate_subcategory', 'difficulty', 'set._id', 'packet._id', 'createdAt', 'updatedAt'];
+  const header = ['_id', 'set.name', 'packet.number', 'number', 'leadin', 'parts.0', 'parts.1', 'parts.2', 'answers_sanitized.0', 'answers_sanitized.1', 'answers_sanitized.2', 'answers.0', 'answers.1', 'answers.2', 'category', 'subcategory', 'alternate_subcategory', 'difficulty', 'set._id', 'packet._id', 'createdAt', 'updatedAt'];
   let csvdata = header.join(',') + '\n';
   for (const bonus of bonuses) {
     for (const key of header) {
@@ -77,7 +77,7 @@ function downloadQuestionsAsText(tossups, bonuses, filename = 'data.txt') {
     textdata += `${tossup.set.name} Packet ${tossup.packet.number}\n`;
     textdata += `Question ID: ${tossup._id}\n`;
     textdata += `${tossup.number}. ${tossup.question}\n`;
-    textdata += `ANSWER: ${tossup.answer}\n`;
+    textdata += `ANSWER: ${tossup.answer_sanitized}\n`;
     textdata += `<${tossup.category} / ${tossup.subcategory}${tossup.alternate_subcategory ? ' (' + tossup.alternate_subcategory + ')' : ''}>\n\n`;
   }
   for (const bonus of bonuses) {
@@ -85,7 +85,7 @@ function downloadQuestionsAsText(tossups, bonuses, filename = 'data.txt') {
     textdata += `${bonus.set.name} Packet ${bonus.packet.number}\n`;
     textdata += `${bonus.number}. ${bonus.leadin}\n`;
     for (let i = 0; i < bonus.parts.length; i++) {
-      textdata += `${getBonusPartLabel(bonus, i)} ${bonus.parts[i]}\nANSWER: ${bonus.answers[i]}\n`;
+      textdata += `${getBonusPartLabel(bonus, i)} ${bonus.parts[i]}\nANSWER: ${bonus.answers_sanitized[i]}\n`;
     }
     textdata += `<${bonus.category} / ${bonus.subcategory}${bonus.alternate_subcategory ? ' (' + bonus.alternate_subcategory + ')' : ''}>\n\n`;
   }
@@ -107,7 +107,7 @@ function downloadQuestionsAsText(tossups, bonuses, filename = 'data.txt') {
  */
 function getBonusPartLabel(bonus, index, defaultValue = 10, defaultDifficulty = '') {
   const value = bonus.values ? bonus.values[index] ?? defaultValue : defaultValue;
-  const difficulty = bonus.difficulties ? bonus.difficulties[index] ?? defaultDifficulty : defaultDifficulty;
+  const difficulty = bonus.difficultyModifiers ? bonus.difficultyModifiers[index] ?? defaultDifficulty : defaultDifficulty;
   return `[${value}${difficulty}]`;
 }
 function getMatchIndices(clean, regex) {
@@ -195,14 +195,10 @@ function highlightTossupQuery({
   const words = ignoreWordOrder ? queryString.split(' ').filter(word => word !== '').map(word => new RegExp(word, 'ig')) : [regExp];
   for (const word of words) {
     if (searchType === 'question' || searchType === 'all') {
-      tossup.question = insertMatches(tossup.question, tossup.unformatted_question, word);
+      tossup.question = insertMatches(tossup.question, tossup.question_sanitized, word);
     }
     if (searchType === 'answer' || searchType === 'all') {
-      if (tossup.formatted_answer) {
-        tossup.formatted_answer = insertMatches(tossup.formatted_answer, tossup.unformatted_answer, word);
-      } else {
-        tossup.answer = insertMatches(tossup.answer, tossup.unformatted_answer, word);
-      }
+      tossup.answer = insertMatches(tossup.answer, tossup.answer_sanitized, word);
     }
   }
   return tossup;
@@ -217,20 +213,14 @@ function highlightBonusQuery({
   const words = ignoreWordOrder ? queryString.split(' ').filter(word => word !== '').map(word => new RegExp(word, 'ig')) : [regExp];
   for (const word of words) {
     if (searchType === 'question' || searchType === 'all') {
-      bonus.leadin = insertMatches(bonus.leadin, bonus.unformatted_leadin, word);
+      bonus.leadin = insertMatches(bonus.leadin, bonus.leadin_sanitized, word);
       for (let i = 0; i < bonus.parts.length; i++) {
-        bonus.parts[i] = insertMatches(bonus.parts[i], bonus.unformatted_parts[i], word);
+        bonus.parts[i] = insertMatches(bonus.parts[i], bonus.parts_sanitized[i], word);
       }
     }
     if (searchType === 'answer' || searchType === 'all') {
-      if (bonus.formatted_answers) {
-        for (let i = 0; i < bonus.formatted_answers.length; i++) {
-          bonus.formatted_answers[i] = insertMatches(bonus.formatted_answers[i], bonus.unformatted_answers[i], word);
-        }
-      } else {
-        for (let i = 0; i < bonus.answers.length; i++) {
-          bonus.answers[i] = insertMatches(bonus.answers[i], bonus.unformatted_answers[i], word);
-        }
+      for (let i = 0; i < bonus.answers.length; i++) {
+        bonus.answers[i] = insertMatches(bonus.answers[i], bonus.answers_sanitized[i], word);
       }
     }
   }
@@ -246,7 +236,7 @@ function TossupCard({
   const _id = tossup._id;
   const packetName = tossup.packet.name;
   function clickToCopy() {
-    let textdata = `${tossup.question}\nANSWER: ${tossup.answer}`;
+    let textdata = `${tossup.question}\nANSWER: ${tossup.answer_sanitized}`;
     let tag = '';
     if (tossup.category && tossup.subcategory && tossup.category !== tossup.subcategory) {
       tag += `${tossup.category} / ${tossup.subcategory}`;
@@ -326,7 +316,6 @@ function TossupCard({
       console.error('Error:', error);
     });
   }
-  const powerParts = highlightedTossup.question.split('(*)');
   return /*#__PURE__*/React.createElement("div", {
     className: "card my-2"
   }, /*#__PURE__*/React.createElement("div", {
@@ -348,13 +337,13 @@ function TossupCard({
     }
   }, /*#__PURE__*/React.createElement("span", {
     dangerouslySetInnerHTML: {
-      __html: powerParts.length > 1 ? '<b>' + powerParts[0] + '(*)</b>' + powerParts[1] : highlightedTossup.question
+      __html: highlightedTossup.question
     }
   }), /*#__PURE__*/React.createElement("hr", {
     className: "my-3"
   }), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("b", null, "ANSWER:"), " ", /*#__PURE__*/React.createElement("span", {
     dangerouslySetInnerHTML: {
-      __html: hideAnswerline ? '' : highlightedTossup?.formatted_answer ?? highlightedTossup.answer
+      __html: hideAnswerline ? '' : highlightedTossup?.answer
     }
   }))), /*#__PURE__*/React.createElement("div", {
     className: `card-footer clickable ${!showCardFooter && 'd-none'}`,
@@ -391,7 +380,7 @@ function BonusCard({
     let textdata = `${bonus.leadin}\n`;
     for (let i = 0; i < bonus.parts.length; i++) {
       textdata += `${getBonusPartLabel(bonus, i)} ${bonus.parts[i]}\n`;
-      textdata += `ANSWER: ${bonus.answers[i]}\n`;
+      textdata += `ANSWER: ${bonus.answers_sanitized[i]}\n`;
     }
     let tag = '';
     if (bonus.category && bonus.subcategory && bonus.category !== bonus.subcategory) {
@@ -502,7 +491,7 @@ function BonusCard({
     }
   })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("b", null, "ANSWER: "), /*#__PURE__*/React.createElement("span", {
     dangerouslySetInnerHTML: {
-      __html: hideAnswerlines ? '' : (highlightedBonus?.formatted_answers ?? highlightedBonus.answers)[i]
+      __html: hideAnswerlines ? '' : highlightedBonus?.answers[i]
     }
   }))))), /*#__PURE__*/React.createElement("div", {
     className: `card-footer clickable ${!showCardFooter && 'd-none'}`,
diff --git a/client/database/index.jsx b/client/database/index.jsx
index a8f2d7da..e879cbbd 100644
--- a/client/database/index.jsx
+++ b/client/database/index.jsx
@@ -97,7 +97,7 @@ function downloadTossupsAsCSV(tossups, filename = 'tossups.csv') {
         'number',
         'question',
         'answer',
-        'formatted_answer',
+        'answer',
         'category',
         'subcategory',
         'alternate_subcategory',
@@ -145,12 +145,12 @@ function downloadBonusesAsCSV(bonuses, filename = 'bonuses.csv') {
         'parts.0',
         'parts.1',
         'parts.2',
+        'answers_sanitized.0',
+        'answers_sanitized.1',
+        'answers_sanitized.2',
         'answers.0',
         'answers.1',
         'answers.2',
-        'formatted_answers.0',
-        'formatted_answers.1',
-        'formatted_answers.2',
         'category',
         'subcategory',
         'alternate_subcategory',
@@ -195,7 +195,7 @@ function downloadQuestionsAsText(tossups, bonuses, filename = 'data.txt') {
         textdata += `${tossup.set.name} Packet ${tossup.packet.number}\n`;
         textdata += `Question ID: ${tossup._id}\n`;
         textdata += `${tossup.number}. ${tossup.question}\n`;
-        textdata += `ANSWER: ${tossup.answer}\n`;
+        textdata += `ANSWER: ${tossup.answer_sanitized}\n`;
         textdata += `<${tossup.category} / ${tossup.subcategory}${tossup.alternate_subcategory ? ' (' + tossup.alternate_subcategory + ')' : ''}>\n\n`;
     }
 
@@ -204,7 +204,7 @@ function downloadQuestionsAsText(tossups, bonuses, filename = 'data.txt') {
         textdata += `${bonus.set.name} Packet ${bonus.packet.number}\n`;
         textdata += `${bonus.number}. ${bonus.leadin}\n`;
         for (let i = 0; i < bonus.parts.length; i++) {
-            textdata += `${getBonusPartLabel(bonus, i)} ${bonus.parts[i]}\nANSWER: ${bonus.answers[i]}\n`;
+            textdata += `${getBonusPartLabel(bonus, i)} ${bonus.parts[i]}\nANSWER: ${bonus.answers_sanitized[i]}\n`;
         }
         textdata += `<${bonus.category} / ${bonus.subcategory}${bonus.alternate_subcategory ? ' (' + bonus.alternate_subcategory + ')' : ''}>\n\n`;
     }
@@ -228,7 +228,7 @@ function downloadQuestionsAsText(tossups, bonuses, filename = 'data.txt') {
  */
 function getBonusPartLabel(bonus, index, defaultValue = 10, defaultDifficulty = '') {
     const value = bonus.values ? (bonus.values[index] ?? defaultValue) : defaultValue;
-    const difficulty = bonus.difficulties ? (bonus.difficulties[index] ?? defaultDifficulty) : defaultDifficulty;
+    const difficulty = bonus.difficultyModifiers ? (bonus.difficultyModifiers[index] ?? defaultDifficulty) : defaultDifficulty;
     return `[${value}${difficulty}]`;
 }
 
@@ -331,15 +331,11 @@ function highlightTossupQuery({ tossup, regExp, searchType = 'all', ignoreWordOr
 
     for (const word of words) {
         if (searchType === 'question' || searchType === 'all') {
-            tossup.question = insertMatches(tossup.question, tossup.unformatted_question, word);
+            tossup.question = insertMatches(tossup.question, tossup.question_sanitized, word);
         }
 
         if (searchType === 'answer' || searchType === 'all') {
-            if (tossup.formatted_answer) {
-                tossup.formatted_answer = insertMatches(tossup.formatted_answer, tossup.unformatted_answer, word);
-            } else {
-                tossup.answer = insertMatches(tossup.answer, tossup.unformatted_answer, word);
-            }
+            tossup.answer = insertMatches(tossup.answer, tossup.answer_sanitized, word);
         }
     }
 
@@ -354,21 +350,15 @@ function highlightBonusQuery({ bonus, regExp, searchType = 'all', ignoreWordOrde
 
     for (const word of words) {
         if (searchType === 'question' || searchType === 'all') {
-            bonus.leadin = insertMatches(bonus.leadin, bonus.unformatted_leadin, word);
+            bonus.leadin = insertMatches(bonus.leadin, bonus.leadin_sanitized, word);
             for (let i = 0; i < bonus.parts.length; i++) {
-                bonus.parts[i] = insertMatches(bonus.parts[i], bonus.unformatted_parts[i], word);
+                bonus.parts[i] = insertMatches(bonus.parts[i], bonus.parts_sanitized[i], word);
             }
         }
 
         if (searchType === 'answer' || searchType === 'all') {
-            if (bonus.formatted_answers) {
-                for (let i = 0; i < bonus.formatted_answers.length; i++) {
-                    bonus.formatted_answers[i] = insertMatches(bonus.formatted_answers[i], bonus.unformatted_answers[i], word);
-                }
-            } else {
-                for (let i = 0; i < bonus.answers.length; i++) {
-                    bonus.answers[i] = insertMatches(bonus.answers[i], bonus.unformatted_answers[i], word);
-                }
+            for (let i = 0; i < bonus.answers.length; i++) {
+                bonus.answers[i] = insertMatches(bonus.answers[i], bonus.answers_sanitized[i], word);
             }
         }
     }
@@ -382,7 +372,7 @@ function TossupCard({ tossup, highlightedTossup, hideAnswerline, showCardFooter,
     const packetName = tossup.packet.name;
 
     function clickToCopy() {
-        let textdata = `${tossup.question}\nANSWER: ${tossup.answer}`;
+        let textdata = `${tossup.question}\nANSWER: ${tossup.answer_sanitized}`;
 
         let tag = '';
         if (tossup.category && tossup.subcategory && tossup.category !== tossup.subcategory) {
@@ -471,8 +461,6 @@ function TossupCard({ tossup, highlightedTossup, hideAnswerline, showCardFooter,
             });
     }
 
-    const powerParts = highlightedTossup.question.split('(*)');
-
     return (
         <div className="card my-2">
             <div className="card-header d-flex justify-content-between">
@@ -485,14 +473,10 @@ function TossupCard({ tossup, highlightedTossup, hideAnswerline, showCardFooter,
             </div>
             <div className="card-container collapse show" id={`question-${_id}`}>
                 <div className="card-body" style={{ 'fontSize': `${fontSize}px` }}>
-                    <span dangerouslySetInnerHTML={{
-                        __html: powerParts.length > 1 ? '<b>' + powerParts[0] + '(*)</b>' + powerParts[1] : highlightedTossup.question,
-                    }}></span>
+                    <span dangerouslySetInnerHTML={{ __html: highlightedTossup.question }}></span>
                     <hr className="my-3"></hr>
                     <div>
-                        <b>ANSWER:</b> <span dangerouslySetInnerHTML={{
-                            __html: hideAnswerline ? '' : (highlightedTossup?.formatted_answer ?? highlightedTossup.answer),
-                        }}></span>
+                        <b>ANSWER:</b> <span dangerouslySetInnerHTML={{ __html: hideAnswerline ? '' : highlightedTossup?.answer }}></span>
                     </div>
                 </div>
                 <div className={`card-footer clickable ${!showCardFooter && 'd-none'}`} onClick={showTossupStats} data-bs-toggle="modal" data-bs-target="#tossup-stats-modal">
@@ -523,7 +507,7 @@ function BonusCard({ bonus, highlightedBonus, hideAnswerlines, showCardFooter, f
         let textdata = `${bonus.leadin}\n`;
         for (let i = 0; i < bonus.parts.length; i++) {
             textdata += `${getBonusPartLabel(bonus, i)} ${bonus.parts[i]}\n`;
-            textdata += `ANSWER: ${bonus.answers[i]}\n`;
+            textdata += `ANSWER: ${bonus.answers_sanitized[i]}\n`;
         }
 
         let tag = '';
@@ -636,7 +620,7 @@ function BonusCard({ bonus, highlightedBonus, hideAnswerlines, showCardFooter, f
                             <div>
                                 <b>ANSWER: </b>
                                 <span dangerouslySetInnerHTML={{
-                                    __html: hideAnswerlines ? '' : (highlightedBonus?.formatted_answers ?? highlightedBonus.answers)[i],
+                                    __html: hideAnswerlines ? '' : highlightedBonus?.answers[i],
                                 }}></span>
                             </div>
                         </div>,
diff --git a/client/geoword/compare.js b/client/geoword/compare.js
index 1f8aceb3..29e2239a 100644
--- a/client/geoword/compare.js
+++ b/client/geoword/compare.js
@@ -79,7 +79,7 @@ document.getElementById('form').addEventListener('submit', event => {
                         <div><b>Given answer:</b> ${escapeHTML(myBuzz.givenAnswer)}</div>
                     </div>
                     <div class="col-6">
-                        <div><b>Answer:</b> ${removeParentheses(myBuzz.formatted_answer ?? myBuzz.answer)}</div>
+                        <div><b>Answer:</b> ${removeParentheses(myBuzz.answer)}</div>
                         <div><b>Celerity:</b> ${(opponentBuzz.celerity ?? 0.0).toFixed(3)}</div>
                         <div><b>Points:</b> ${opponentBuzz.points}</div>
                         <div><b>Given answer:</b> ${escapeHTML(opponentBuzz.givenAnswer)}</div>
diff --git a/client/geoword/packet.js b/client/geoword/packet.js
index 9b473c0a..677121d0 100644
--- a/client/geoword/packet.js
+++ b/client/geoword/packet.js
@@ -18,7 +18,7 @@ fetch('/api/geoword/packet?' + new URLSearchParams({ packetName, division }))
 
         for (const tossup of packet) {
             innerHTML += `<div>${tossup.questionNumber}. ${tossup.question}</div>`;
-            innerHTML += `<div>ANSWER: ${tossup.formatted_answer ?? tossup.answer}</div>`;
+            innerHTML += `<div>ANSWER: ${tossup.answer}</div>`;
             innerHTML += `<p>&lt;${tossup.category} / ${tossup.subcategory}&gt;</p>`;
             innerHTML += '<hr class="my-3"></hr>';
         }
diff --git a/client/geoword/stats.js b/client/geoword/stats.js
index e035ab63..0666400a 100644
--- a/client/geoword/stats.js
+++ b/client/geoword/stats.js
@@ -44,7 +44,7 @@ fetch('/api/geoword/stats?' + new URLSearchParams({ packetName }))
                     <div><b>Best celerity:</b> ${(leaderboard[i].bestCelerity ?? 0.0).toFixed(3)}</div>
                     <div><b>Average correct celerity:</b> ${(leaderboard[i].averageCorrectCelerity ?? 0).toFixed(3)}</div>
                     <div><b>Average points:</b> ${(leaderboard[i].averagePoints ?? 0.0).toFixed(2)}</div>
-                    <div><b>Answer:</b> ${buzzArray[i].formatted_answer}</div>
+                    <div><b>Answer:</b> ${buzzArray[i].answer}</div>
                 </div>
             </div>
             <hr>
diff --git a/client/multiplayer/room.js b/client/multiplayer/room.js
index c39290f4..b9f56d72 100644
--- a/client/multiplayer/room.js
+++ b/client/multiplayer/room.js
@@ -147,20 +147,10 @@ socket.onmessage = function (event) {
         break;
 
     case 'reveal-answer': {
+        document.getElementById('question').innerHTML = tossup.question;
         document.getElementById('answer').innerHTML = 'ANSWER: ' + data.answer;
         document.getElementById('pause').disabled = true;
         showNextButton();
-
-        question = document.getElementById('question').innerHTML;
-        if (powermarkPosition) {
-            question = question.slice(0, powermarkPosition) + '(*) ' + question.slice(powermarkPosition);
-        }
-        const powerParts = question.split('(*)');
-        if (powerParts.length > 1) {
-            document.getElementById('question').innerHTML = `<b>${powerParts[0]}(*)</b>${powerParts[1]}`;
-        } else {
-            document.getElementById('question').textContent = question;
-        }
         break;
     }
 
diff --git a/client/singleplayer/bonuses.js b/client/singleplayer/bonuses.js
index 515b3c09..c2494618 100644
--- a/client/singleplayer/bonuses.js
+++ b/client/singleplayer/bonuses.js
@@ -326,14 +326,7 @@ async function loadRandomBonuses({ alternateSubcategories, categories, difficult
     await fetch('/api/random-bonus?' + new URLSearchParams({ alternateSubcategories, categories, difficulties, maxYear, minYear, number, subcategories, threePartBonuses }))
         .then(response => response.json())
         .then(response => response.bonuses)
-        .then(questions => {
-            for (let i = 0; i < questions.length; i++) {
-                if (Object.prototype.hasOwnProperty.call(questions[i], 'formatted_answers'))
-                    questions[i].answers = questions[i].formatted_answers;
-            }
-
-            randomQuestions = questions;
-        });
+        .then(questions => { randomQuestions = questions; });
 }
 
 
diff --git a/client/singleplayer/tossups.js b/client/singleplayer/tossups.js
index c2013b5d..e5b647ca 100644
--- a/client/singleplayer/tossups.js
+++ b/client/singleplayer/tossups.js
@@ -196,7 +196,7 @@ async function advanceQuestion() {
         } while (!isValidCategory(questions[questionNumber - 1], query.categories, query.subcategories));
 
         if (Object.keys(questions[0]).length > 0) {
-            questionText = questions[questionNumber - 1].question;
+            questionText = questions[questionNumber - 1].question_sanitized;
             questionTextSplit = questionText.split(' ').filter(word => word !== '');
             document.getElementById('question-number-info').textContent = questionNumber;
         }
@@ -344,14 +344,7 @@ async function loadRandomTossups({ alternateSubcategories, categories, difficult
     await fetch('/api/random-tossup?' + new URLSearchParams({ alternateSubcategories, categories, difficulties, maxYear, minYear, number, powermarkOnly, subcategories, standardOnly }))
         .then(response => response.json())
         .then(response => response.tossups)
-        .then(questions => {
-            for (let i = 0; i < questions.length; i++) {
-                if (Object.prototype.hasOwnProperty.call(questions[i], 'formatted_answer'))
-                    questions[i].answer = questions[i].formatted_answer;
-            }
-
-            randomQuestions = questions;
-        });
+        .then(questions => { randomQuestions = questions; });
 }
 
 
@@ -476,13 +469,8 @@ function readQuestion(expectedReadTime) {
 
 
 function revealQuestion() {
+    document.getElementById('question').innerHTML = questions[questionNumber - 1].question;
     document.getElementById('answer').innerHTML = 'ANSWER: ' + questions[questionNumber - 1].answer;
-    let question = (document.getElementById('question').innerHTML);
-    if (powermarkPosition)
-        question = question.slice(0, powermarkPosition) + '(*) ' + question.slice(powermarkPosition);
-
-    const powerParts = (question + questionTextSplit.join(' ')).split('(*)');
-    document.getElementById('question').innerHTML = `${powerParts.length > 1 ? '<b>' + powerParts[0] + '(*)</b>' + powerParts[1] : powerParts[0]}`;
 
     document.getElementById('buzz').disabled = true;
     document.getElementById('buzz').textContent = 'Buzz';
diff --git a/client/user/stars/bonuses.js b/client/user/stars/bonuses.js
index 3d5931b1..43807059 100644
--- a/client/user/stars/bonuses.js
+++ b/client/user/stars/bonuses.js
@@ -11,7 +11,7 @@ fetch('/auth/stars/bonuses')
                     <p>
                         ${getBonusPartLabel(bonus, i)} ${bonus.parts[i]}
                     </p>
-                    <div>ANSWER: ${(bonus?.formatted_answers ?? bonus.answers)[i]}</div>
+                    <div>ANSWER: ${bonus?.answers[i]}</div>
                 `;
             }
 
@@ -65,6 +65,6 @@ fetch('/auth/stars/bonuses')
 
 function getBonusPartLabel(bonus, index, defaultValue = 10, defaultDifficulty = '') {
     const value = bonus.values ? (bonus.values[index] ?? defaultValue) : defaultValue;
-    const difficulty = bonus.difficulties ? (bonus.difficulties[index] ?? defaultDifficulty) : defaultDifficulty;
+    const difficulty = bonus.difficultyModifiers ? (bonus.difficultyModifiers[index] ?? defaultDifficulty) : defaultDifficulty;
     return `[${value}${difficulty}]`;
 }
diff --git a/client/user/stars/tossups.js b/client/user/stars/tossups.js
index 4fc6234d..297a947a 100644
--- a/client/user/stars/tossups.js
+++ b/client/user/stars/tossups.js
@@ -20,7 +20,7 @@ fetch('/auth/stars/tossups')
                         <div class="card-body">
                             <span>${tossup.question}</span>&nbsp;
                             <hr></hr>
-                            <div><b>ANSWER:</b> ${tossup.formatted_answer ?? tossup.answer}</div>
+                            <div><b>ANSWER:</b> ${tossup.answer}</div>
                         </div>
                         <div class="card-footer">
                             <small class="text-muted">${tossup.packet.name ? 'Packet ' + tossup.packet.name : '&nbsp;'}</small>
diff --git a/client/user/stats/tossups.js b/client/user/stats/tossups.js
index d7dcd039..0eecf7c4 100644
--- a/client/user/stats/tossups.js
+++ b/client/user/stats/tossups.js
@@ -24,7 +24,7 @@ function fetchTossupStats({ difficulties = '', setName = '', includeMultiplayer
                             <div class="card-body">
                                 <span>${tossup.question}</span>&nbsp;
                                 <hr></hr>
-                                <div><b>ANSWER:</b> ${tossup.formatted_answer ?? tossup.answer}</div>
+                                <div><b>ANSWER:</b> ${tossup.answer}</div>
                             </div>
                             <div class="card-footer">
                                 <small class="text-muted">${tossup.packet.name ? 'Packet ' + tossup.packet.name : '&nbsp;'}</small>
diff --git a/client/utilities.js b/client/utilities.js
index f3badb2a..35befd7f 100644
--- a/client/utilities.js
+++ b/client/utilities.js
@@ -168,7 +168,6 @@ const createTossupCard = (function () {
         questionCounter++;
 
         const { question, answer, category, subcategory, alternate_subcategory, set, packet, number, _id } = tossup;
-        const powerParts = question.replace(/<\/?b>/g, '').split('(*)');
 
         // append a card containing the question to the history element
         const card = document.createElement('div');
@@ -186,7 +185,7 @@ const createTossupCard = (function () {
             </div>
             <div class="card-container collapse" id="question-${questionCounter}">
                 <div class="card-body">
-                    ${powerParts.length > 1 ? '<b>' + escapeHTML(powerParts[0]) + '(*)</b>' + escapeHTML(powerParts[1]) : escapeHTML(question)}
+                    ${question}
                     <a class="user-select-none" href="#" id="report-question-${_id}" data-bs-toggle="modal" data-bs-target="#report-question-modal">Report Question</a>
                     <hr></hr>
                     <div>ANSWER: ${answer}</div>
@@ -245,7 +244,7 @@ const createTossupCard = (function () {
  */
 function getBonusPartLabel(bonus, index, defaultValue = 10, defaultDifficulty = '') {
     const value = bonus.values ? (bonus.values[index] ?? defaultValue) : defaultValue;
-    const difficulty = bonus.difficulties ? (bonus.difficulties[index] ?? defaultDifficulty) : defaultDifficulty;
+    const difficulty = bonus.difficultyModifiers ? (bonus.difficultyModifiers[index] ?? defaultDifficulty) : defaultDifficulty;
     return `[${value}${difficulty}]`;
 }
 
diff --git a/database/geoword/get-answer.js b/database/geoword/get-answer.js
index 77c2063b..d457c4de 100644
--- a/database/geoword/get-answer.js
+++ b/database/geoword/get-answer.js
@@ -12,8 +12,7 @@ async function getAnswer(packetName, division, questionNumber) {
     if (!result) {
         return '';
     } else {
-        const { answer, formatted_answer } = result;
-        return formatted_answer ?? answer;
+        return result.answer;
     }
 }
 
diff --git a/database/geoword/get-buzzes.js b/database/geoword/get-buzzes.js
index 94260d2e..b7471358 100644
--- a/database/geoword/get-buzzes.js
+++ b/database/geoword/get-buzzes.js
@@ -13,8 +13,8 @@ async function getBuzzes(packetName, division, user_id, protests=false) {
         celerity: 1,
         points: 1,
         questionNumber: 1,
+        answer_sanitized: '$tossup.answer_sanitized',
         answer: '$tossup.answer',
-        formatted_answer: '$tossup.formatted_answer',
         givenAnswer: 1,
         prompts: 1,
     };
diff --git a/database/qbreader/get-frequency-list.js b/database/qbreader/get-frequency-list.js
index c90970ae..727af5e0 100644
--- a/database/qbreader/get-frequency-list.js
+++ b/database/qbreader/get-frequency-list.js
@@ -58,7 +58,7 @@ async function getFrequencyList(subcategory, difficulties=DIFFICULTIES, limit=50
         { $match: { subcategory, difficulty: { $in: difficulties } } },
         { $addFields: {
             // This is a regex that matches everything before the first open parenthesis or bracket.
-            regex: { $regexFind: { input: '$answer', regex: /^[^[(]*/ } },
+            regex: { $regexFind: { input: '$answer_sanitized', regex: /^[^[(]*/ } },
         } },
         { $addFields: {
             // This is a regex that matches everything outside of parentheses ()
@@ -69,13 +69,13 @@ async function getFrequencyList(subcategory, difficulties=DIFFICULTIES, limit=50
         } },
         { $group: { _id: '$sanitized_answer', count: { $sum: 1 } } },
         { $match: { _id: { $ne: null } } },
-        { $addFields: { answer: '$_id' } },
-        { $sort: { answer: 1 } },
+        { $addFields: { answer_sanitized: '$_id' } },
+        { $sort: { answer_sanitized: 1 } },
     ];
 
     const bonusAggregation = [
-        { $unwind: { path: '$answers' } },
-        { $addFields: { answer: '$answers' } },
+        { $unwind: { path: '$answers_sanitized' } },
+        { $addFields: { answer_sanitized: '$answers_sanitized' } },
     ].concat(tossupAggregation);
 
     switch (questionType) {
@@ -109,8 +109,8 @@ async function getFrequencyList(subcategory, difficulties=DIFFICULTIES, limit=50
     const frequencyList = mergeTwoSortedArrays(
         tossupList,
         bonusList,
-        (a) => a.answer,
-        (a, b) => ({ answer: a.answer, count: a.count + b.count }),
+        (a) => a.answer_sanitized,
+        (a, b) => ({ answer_sanitized: a.answer_sanitized, count: a.count + b.count }),
     );
 
     frequencyList.sort((a, b) => b.count - a.count);
diff --git a/database/qbreader/get-packet.js b/database/qbreader/get-packet.js
index fe258dbb..a98112dd 100644
--- a/database/qbreader/get-packet.js
+++ b/database/qbreader/get-packet.js
@@ -11,7 +11,7 @@ import * as types from '../../types.js';
 function modaqifyTossup(tossup) {
     const result = {
         question: tossup.question,
-        answer: tossup.answer,
+        answer: tossup.answer.replace('<i>', '<em>').replace('</i>', '</em>'),
         metadata: `${tossup.category} - ${tossup.subcategory}`,
     };
 
@@ -19,10 +19,6 @@ function modaqifyTossup(tossup) {
         result.question = '<b>' + tossup.question.replace('(*)', '(*)</b>');
     }
 
-    if (tossup.formatted_answer) {
-        result.answer = tossup.formatted_answer.replace('<i>', '<em>').replace('</i>', '</em>');
-    }
-
     return result;
 }
 
@@ -32,16 +28,12 @@ function modaqifyBonus(bonus) {
         values: bonus.values ?? bonus.parts.map(() => 10),
         leadin: bonus.leadin,
         parts: bonus.parts,
-        answers: bonus.answers,
+        answers: bonus.answers.map(answer => answer.replace('<i>', '<em>').replace('</i>', '</em>')),
         metadata: `${bonus.category} - ${bonus.subcategory}`,
     };
 
-    if (bonus.difficulties) {
-        result.difficultyModifiers = bonus.difficulties;
-    }
-
-    if (bonus.formatted_answers) {
-        result.answers = bonus.formatted_answers.map(answer => answer.replace('<i>', '<em>').replace('</i>', '</em>'));
+    if (bonus.difficultyModifiers) {
+        result.difficultyModifiers = bonus.difficultyModifiers;
     }
 
     return result;
@@ -55,11 +47,10 @@ function modaqifyBonus(bonus) {
  * @param {Array<String>} [options.questionTypes=['tossups', 'bonuses']] - The types of questions to retrieve.
  * If only one allowed type is specified, only that type will be searched for (increasing query speed).
  * The other type will be returned as an empty array.
- * @param {boolean} [options.replaceUnformattedAnswer=true] - Whether to replace unformatted answers.
  * @param {boolean} [options.modaq=false] - Whether to output in a result compatible with MODAQ.
  * @returns {Promise<{tossups: types.Tossup[], bonuses: types.Bonus[]}>} The retrieved packet of questions.
  */
-async function getPacket({ setName, packetNumber, questionTypes = ['tossups', 'bonuses'], replaceUnformattedAnswer = true, modaq = false }) {
+async function getPacket({ setName, packetNumber, questionTypes = ['tossups', 'bonuses'], modaq = false }) {
     if (!setName || isNaN(packetNumber) || packetNumber < 1) {
         return { 'tossups': [], 'bonuses': [] };
     }
@@ -99,18 +90,6 @@ async function getPacket({ setName, packetNumber, questionTypes = ['tossups', 'b
         result.bonuses = values[1];
     }
 
-    if (replaceUnformattedAnswer && !modaq) {
-        for (const tossup of result.tossups) {
-            if (Object.prototype.hasOwnProperty.call(tossup, 'formatted_answer'))
-                tossup.answer = tossup.formatted_answer;
-        }
-
-        for (const bonus of result.bonuses) {
-            if (Object.prototype.hasOwnProperty.call(bonus, 'formatted_answers'))
-                bonus.answers = bonus.formatted_answers;
-        }
-    }
-
     if (modaq) {
         result.tossups = result.tossups.map(tossup => modaqifyTossup(tossup));
         result.bonuses = result.bonuses.map(bonus => modaqifyBonus(bonus));
diff --git a/database/qbreader/get-query.js b/database/qbreader/get-query.js
index 81c6883d..ea056e2b 100644
--- a/database/qbreader/get-query.js
+++ b/database/qbreader/get-query.js
@@ -178,11 +178,11 @@ async function getTossupQuery(options) {
         const orQuery = [];
 
         if (['question', 'all'].includes(searchType)) {
-            orQuery.push({ unformatted_question: { $regex: word, $options: 'i' } });
+            orQuery.push({ question_sanitized: { $regex: word, $options: 'i' } });
         }
 
         if (['answer', 'all'].includes(searchType)) {
-            orQuery.push({ unformatted_answer: { $regex: word, $options: 'i' } });
+            orQuery.push({ answer_sanitized: { $regex: word, $options: 'i' } });
         }
 
         andQuery.push({ $or: orQuery });
@@ -219,12 +219,12 @@ async function getBonusQuery(options) {
         const orQuery = [];
 
         if (['question', 'all'].includes(searchType)) {
-            orQuery.push({ unformatted_leadin: { $regex: word, $options: 'i' } });
-            orQuery.push({ unformatted_parts: { $regex: word, $options: 'i' } });
+            orQuery.push({ leadin_sanitized: { $regex: word, $options: 'i' } });
+            orQuery.push({ parts_sanitized: { $regex: word, $options: 'i' } });
         }
 
         if (['answer', 'all'].includes(searchType)) {
-            orQuery.push({ unformatted_answers: { $regex: word, $options: 'i' } });
+            orQuery.push({ answers_sanitized: { $regex: word, $options: 'i' } });
         }
 
         andQuery.push({ $or: orQuery });
@@ -287,7 +287,7 @@ function buildQueryAggregation({ query, difficulties, categories, subcategories,
     }
 
     if (powermarkOnly) {
-        query.unformatted_question = { $regex: '\\(\\*\\)' };
+        query.question_sanitized = { $regex: '\\(\\*\\)' };
     }
 
     const aggregation = [
diff --git a/database/qbreader/get-random-bonuses.js b/database/qbreader/get-random-bonuses.js
index 044d9352..165fd3f6 100644
--- a/database/qbreader/get-random-bonuses.js
+++ b/database/qbreader/get-random-bonuses.js
@@ -56,7 +56,7 @@ async function getRandomBonuses({
     if (bonusLength) {
         bonusLength = parseInt(bonusLength);
         aggregation[0].$match.parts = { $size: bonusLength };
-        aggregation[0].$match.answers = { $size: bonusLength };
+        aggregation[0].$match.answers_sanitized = { $size: bonusLength };
     }
 
     if (standardOnly) {
diff --git a/database/qbreader/get-set.js b/database/qbreader/get-set.js
index c2aee04a..ca3a3872 100644
--- a/database/qbreader/get-set.js
+++ b/database/qbreader/get-set.js
@@ -12,11 +12,10 @@ import * as types from '../../types.js';
  * @param {string[]} object.categories
  * @param {string[]} object.subcategories
  * @param {'tossup' | 'bonus'} [object.questionType='tossup'] - Type of question you want to get. Default: `'tossup'`.
- * @param {boolean} object.replaceUnformattedAnswer - whether to replace the 'answer(s)' key on each question with the value corresponding to 'formatted_answer(s)' (if it exists). Default: `true`
  * @param {boolean} object.reverse - whether to reverse the order of the questions in the array. Useful for functions that pop at the end of the array, Default: `false`
  * @returns {Promise<types.Tossup[] | types.Bonus[]>}
  */
-async function getSet({ setName, packetNumbers, categories, subcategories, questionType = 'tossup', replaceUnformattedAnswer = true, reverse = false }) {
+async function getSet({ setName, packetNumbers, categories, subcategories, questionType = 'tossup', reverse = false }) {
     if (!setName) return [];
 
     if (!categories || categories.length === 0) categories = CATEGORIES;
@@ -37,27 +36,9 @@ async function getSet({ setName, packetNumbers, categories, subcategories, quest
 
     if (questionType === 'tossup') {
         const questionArray = await tossups.find(filter, options).toArray();
-
-        if (replaceUnformattedAnswer) {
-            for (let i = 0; i < questionArray.length; i++) {
-                if (questionArray[i].formatted_answer) {
-                    questionArray[i].answer = questionArray[i].formatted_answer;
-                }
-            }
-        }
-
         return questionArray || [];
     } else if (questionType === 'bonus') {
         const questionArray = await bonuses.find(filter, options).toArray();
-
-        if (replaceUnformattedAnswer) {
-            for (let i = 0; i < questionArray.length; i++) {
-                if (questionArray[i].formatted_answers) {
-                    questionArray[i].answers = questionArray[i].formatted_answers;
-                }
-            }
-        }
-
         return questionArray || [];
     }
 }
diff --git a/database/schemas.js b/database/schemas.js
index 0a36a370..cad8d9f1 100644
--- a/database/schemas.js
+++ b/database/schemas.js
@@ -17,11 +17,11 @@ const schemas = {
                 'description': 'The question text',
                 'type': 'string',
             },
-            'formatted_answer': {
+            'answer': {
                 'description': 'The answerline, formatted with HTML',
                 'type': 'string',
             },
-            'answer': {
+            'answer_sanitized': {
                 'description': 'The answerline, unformatted',
                 'type': 'string',
             },
@@ -87,8 +87,8 @@ const schemas = {
         'required': [
             '_id',
             'question',
-            'formatted_answer',
             'answer',
+            'answer_sanitized',
             'subcategory',
             'category',
             'packet',
@@ -126,7 +126,7 @@ const schemas = {
                 'minItems': 3,
                 'maxItems': 3,
             },
-            'formatted_answers': {
+            'answers': {
                 'description': 'The answerlines, formatted with HTML',
                 'type': 'array',
                 'items': {
@@ -135,7 +135,7 @@ const schemas = {
                 'minItems': 3,
                 'maxItems': 3,
             },
-            'answers': {
+            'answers_sanitized': {
                 'description': 'The answerlines, unformatted',
                 'type': 'array',
                 'items': {
@@ -207,8 +207,8 @@ const schemas = {
             '_id',
             'leadin',
             'parts',
-            'formatted_answers',
             'answers',
+            'answers_sanitized',
             'subcategory',
             'category',
             'packet',
diff --git a/server/TossupRoom.js b/server/TossupRoom.js
index a0f2c62c..7d92c90c 100644
--- a/server/TossupRoom.js
+++ b/server/TossupRoom.js
@@ -473,12 +473,8 @@ class TossupRoom {
             this.tossup = this.randomQuestionCache.pop();
         }
 
-        if (Object.prototype.hasOwnProperty.call(this.tossup, 'formatted_answer')) {
-            this.tossup.answer = this.tossup.formatted_answer;
-        }
-
         this.questionProgress = QuestionProgressEnum.READING;
-        this.questionSplit = this.tossup.question.split(' ').filter(word => word !== '');
+        this.questionSplit = this.tossup.question_sanitized.split(' ').filter(word => word !== '');
         return true;
     }
 
diff --git a/test/database.test.js b/test/database.test.js
index d74b7c08..79dfaa5b 100644
--- a/test/database.test.js
+++ b/test/database.test.js
@@ -77,7 +77,7 @@ async function testCorrectness() {
                 assert.propertyVal(tossups, 'count', tossupCount, 'tossup count');
                 assert.propertyVal(bonuses, 'count', bonusCount, 'bonus count');
                 assert.strictEqual(tossups.questionArray[0].question, expectedFirstTossupQueston, 'tossup array - question');
-                assert.strictEqual(tossups.questionArray[0].answer, expectedFirstTossupAnswer, 'tossup array - answer');
+                assert.strictEqual(tossups.questionArray[0].answer_sanitized, expectedFirstTossupAnswer, 'tossup array - answer');
             });
         }
         {
diff --git a/types.js b/types.js
index 169c9f97..0d1ccf45 100644
--- a/types.js
+++ b/types.js
@@ -22,25 +22,15 @@ import { ObjectId } from 'mongodb';
  * @property {string} set.name
  * @property {number} set.year
  *
- * @property {"tossup" | "bonus"} type
  * @property {Date} createdAt
  * @property {Date} updatedAt
- *
- * @property {string} [packetName] Deprecated
- * @property {number} [packetNumber] Deprecated
- * @property {ObjectId} [packet_id] Deprecated
- * @property {number} questionNumber Deprecated
- * @property {string} [setName] Deprecated
- * @property {number} [setYear] Deprecated
- * @property {ObjectId} [set_id] Deprecated
  */
 
 /**
  * @typedef {object} TossupProperties
  * @property {string} question
+ * @property {string} answer_sanitized
  * @property {string} answer
- * @property {string} [formatted_answer]
- * @property {"tossup"} type
  *
  * @typedef {Question & TossupProperties} Tossup
  */
@@ -50,11 +40,10 @@ import { ObjectId } from 'mongodb';
  * @typedef {object} BonusProperties
  * @property {string} leadin
  * @property {string[]} parts
+ * @property {string[]} answers_sanitized
  * @property {string[]} answers
- * @property {string[]} [formatted_answers]
  * @property {number[]} [values]
- * @property {("e" | "m" | "h")[]} [difficulties]
- * @property {"bonus"} type
+ * @property {("e" | "m" | "h")[]} [difficultyModifiers]
  *
  * @typedef {Question & BonusProperties} Bonus
  */