4 files changed, 15 insertions, 20 deletions
diff --git a/webAO/client/addTrack.ts b/webAO/client/addTrack.ts
index 09ca049c..bba4b088 100644
--- a/webAO/client/addTrack.ts
+++ b/webAO/client/addTrack.ts
@@ -1,11 +1,11 @@
 import { client } from "../client";
-import { unescapeChat, safeTags } from "../encoding";
+import { unescapeChat } from "../encoding";
 import { getFilenameFromPath } from "../utils/paths";
 
 export const addTrack = (trackname: string) => {
   const newentry = <HTMLOptionElement>document.createElement("OPTION");
   const songName = getFilenameFromPath(trackname);
-  newentry.text = safeTags(unescapeChat(songName));
+  newentry.text = unescapeChat(songName);
   newentry.value = trackname;
   (<HTMLSelectElement>document.getElementById("client_musiclist")).options.add(
     newentry,
diff --git a/webAO/client/createArea.ts b/webAO/client/createArea.ts
index a90b49ad..6bc00c00 100644
--- a/webAO/client/createArea.ts
+++ b/webAO/client/createArea.ts
@@ -1,9 +1,7 @@
 import { client } from "../client";
 import { area_click } from "../dom/areaClick";
-import { safeTags } from "../encoding";
 
-export const createArea = (id: number, aname: string) => {
-  const name = safeTags(aname);
+export const createArea = (id: number, name: string) => {
   const thisarea = {
     name,
     players: 0,
diff --git a/webAO/client/handleBans.ts b/webAO/client/handleBans.ts
index 4abd1f07..f9a005b3 100644
--- a/webAO/client/handleBans.ts
+++ b/webAO/client/handleBans.ts
@@ -1,5 +1,3 @@
-import { safeTags } from "../encoding";
-
 /**
  * Handles the kicked packet
  * @param {string} type is it a kick or a ban
diff --git a/webAO/client/handleCharacterInfo.ts b/webAO/client/handleCharacterInfo.ts
index c7bcc943..278c6a75 100644
--- a/webAO/client/handleCharacterInfo.ts
+++ b/webAO/client/handleCharacterInfo.ts
@@ -1,5 +1,4 @@
 import { client } from "../client";
-import { safeTags } from "../encoding";
 import iniParse from "../iniParse";
 import request from "../services/request";
 import { AO_HOST } from "./aoHost";
@@ -22,17 +21,17 @@ export const setupCharacterBasic = (chargs: string[], charid: number) => {
     const mute_select = <HTMLSelectElement>(
       document.getElementById("mute_select")
     );
-    mute_select.add(new Option(safeTags(chargs[0]), String(charid)));
+    mute_select.add(new Option(chargs[0], String(charid)));
     const pair_select = <HTMLSelectElement>(
       document.getElementById("pair_select")
     );
-    pair_select.add(new Option(safeTags(chargs[0]), String(charid)));
+    pair_select.add(new Option(chargs[0], String(charid)));
 
     // Store defaults — these get replaced with actual ini values by ensureCharIni
     client.chars[charid] = {
-      name: safeTags(chargs[0]),
-      showname: safeTags(chargs[0]),
-      desc: safeTags(chargs[1]),
+      name: chargs[0],
+      showname: chargs[0],
+      desc: chargs[1],
       blips: "m",
       gender: "",
       side: "def",
@@ -86,14 +85,14 @@ export const ensureCharIni = async (charid: number): Promise<any> => {
   cini.emotions = Object.assign(default_emotions, cini.emotions);
 
   // Replace defaults with actual ini values
-  char.showname = safeTags(cini.options.showname);
-  char.blips = safeTags(cini.options.blips);
-  char.gender = safeTags(cini.options.gender);
-  char.side = safeTags(cini.options.side);
+  char.showname = cini.options.showname;
+  char.blips = cini.options.blips;
+  char.gender = cini.options.gender;
+  char.side = cini.options.side;
   char.chat =
     cini.options.chat === ""
-      ? safeTags(cini.options.category)
-      : safeTags(cini.options.chat);
+      ? cini.options.category
+      : cini.options.chat;
   char.icon = img ? img.src : "";
   char.inifile = cini;
 
@@ -124,7 +123,7 @@ export const handleCharacterInfo = async (chargs: string[], charid: number) => {
 
     // Reset inifile so ensureCharIni will re-fetch
     if (client.chars[charid]) {
-      client.chars[charid].name = safeTags(chargs[0]);
+      client.chars[charid].name = chargs[0];
       client.chars[charid].inifile = null;
     } else {
       setupCharacterBasic(chargs, charid);