diff --git a/src/h1/xsk/assembler.cpp b/src/h1/xsk/assembler.cpp
index b95c18c8..271f8d3f 100644
--- a/src/h1/xsk/assembler.cpp
+++ b/src/h1/xsk/assembler.cpp
@@ -260,19 +260,19 @@ void assembler::assemble_instruction(const instruction::ptr& inst)
         case opcode::OP_GetIString:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
             script_->write<std::uint32_t>(0);
-            stack_->write_c_string(utils::string::to_code(inst->data[0]));
+            stack_->write_c_string(inst->data[0]);
             break;
         case opcode::OP_GetAnimation:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
             script_->write<std::uint32_t>(0);
             script_->write<std::uint32_t>(0);
-            stack_->write_c_string(utils::string::unquote(inst->data[0]));
-            stack_->write_c_string(utils::string::unquote(inst->data[1]));
+            stack_->write_c_string(inst->data[0]);
+            stack_->write_c_string(inst->data[1]);
             break;
         case opcode::OP_GetAnimTree:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
             script_->write<std::uint8_t>(0);
-            stack_->write_c_string(utils::string::unquote(inst->data[0]));
+            stack_->write_c_string(inst->data[0]);
             break;
         case opcode::OP_waittillmatch:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
@@ -468,7 +468,7 @@ void assembler::assemble_end_switch(const instruction::ptr& inst)
             else
             {
                 script_->write<uint32_t>(i + 1);
-                stack_->write_c_string(utils::string::unquote(inst->data[1 + (3 * i) + 1]));
+                stack_->write_c_string(inst->data[1 + (3 * i) + 1]);
             }
 
             index += 4;
diff --git a/src/h2/xsk/assembler.cpp b/src/h2/xsk/assembler.cpp
index 48a69cf4..083411a3 100644
--- a/src/h2/xsk/assembler.cpp
+++ b/src/h2/xsk/assembler.cpp
@@ -260,19 +260,19 @@ void assembler::assemble_instruction(const instruction::ptr& inst)
         case opcode::OP_GetIString:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
             script_->write<std::uint32_t>(0);
-            stack_->write_c_string(utils::string::to_code(inst->data[0]));
+            stack_->write_c_string(inst->data[0]);
             break;
         case opcode::OP_GetAnimation:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
             script_->write<std::uint32_t>(0);
             script_->write<std::uint32_t>(0);
-            stack_->write_c_string(utils::string::unquote(inst->data[0]));
-            stack_->write_c_string(utils::string::unquote(inst->data[1]));
+            stack_->write_c_string(inst->data[0]);
+            stack_->write_c_string(inst->data[1]);
             break;
         case opcode::OP_GetAnimTree:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
             script_->write<std::uint8_t>(0);
-            stack_->write_c_string(utils::string::unquote(inst->data[0]));
+            stack_->write_c_string(inst->data[0]);
             break;
         case opcode::OP_waittillmatch:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
@@ -468,7 +468,7 @@ void assembler::assemble_end_switch(const instruction::ptr& inst)
             else
             {
                 script_->write<uint32_t>(i + 1);
-                stack_->write_c_string(utils::string::unquote(inst->data[1 + (3 * i) + 1]));
+                stack_->write_c_string(inst->data[1 + (3 * i) + 1]);
             }
 
             index += 4;
diff --git a/src/iw5/xsk/assembler.cpp b/src/iw5/xsk/assembler.cpp
index 6add84b9..a34e45ba 100644
--- a/src/iw5/xsk/assembler.cpp
+++ b/src/iw5/xsk/assembler.cpp
@@ -260,18 +260,18 @@ void assembler::assemble_instruction(const instruction::ptr& inst)
         case opcode::OP_GetIString:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
             script_->write<std::uint16_t>(0);
-            stack_->write_c_string(utils::string::to_code(inst->data[0]));
+            stack_->write_c_string(inst->data[0]);
             break;
         case opcode::OP_GetAnimation:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
             script_->write<std::uint32_t>(0);
-            stack_->write_c_string(utils::string::unquote(inst->data[0]));
-            stack_->write_c_string(utils::string::unquote(inst->data[1]));
+            stack_->write_c_string(inst->data[0]);
+            stack_->write_c_string(inst->data[1]);
             break;
         case opcode::OP_GetAnimTree:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
             script_->write<std::uint8_t>(0);
-            stack_->write_c_string(utils::string::unquote(inst->data[0]));
+            stack_->write_c_string(inst->data[0]);
             break;
         case opcode::OP_waittillmatch:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
@@ -467,7 +467,7 @@ void assembler::assemble_end_switch(const instruction::ptr& inst)
             else
             {
                 script_->write<uint32_t>(i + 1);
-                stack_->write_c_string(utils::string::unquote(inst->data[1 + (3 * i) + 1]));
+                stack_->write_c_string(inst->data[1 + (3 * i) + 1]);
             }
 
             index += 4;
diff --git a/src/iw6/xsk/assembler.cpp b/src/iw6/xsk/assembler.cpp
index f3c6b48d..57d46e15 100644
--- a/src/iw6/xsk/assembler.cpp
+++ b/src/iw6/xsk/assembler.cpp
@@ -259,19 +259,19 @@ void assembler::assemble_instruction(const instruction::ptr& inst)
         case opcode::OP_GetIString:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
             script_->write<std::uint32_t>(0);
-            stack_->write_c_string(utils::string::to_code(inst->data[0]));
+            stack_->write_c_string(inst->data[0]);
             break;
         case opcode::OP_GetAnimation:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
             script_->write<std::uint32_t>(0);
             script_->write<std::uint32_t>(0);
-            stack_->write_c_string(utils::string::unquote(inst->data[0]));
-            stack_->write_c_string(utils::string::unquote(inst->data[1]));
+            stack_->write_c_string(inst->data[0]);
+            stack_->write_c_string(inst->data[1]);
             break;
         case opcode::OP_GetAnimTree:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
             script_->write<std::uint8_t>(0);
-            stack_->write_c_string(utils::string::unquote(inst->data[0]));
+            stack_->write_c_string(inst->data[0]);
             break;
         case opcode::OP_waittillmatch:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
@@ -467,7 +467,7 @@ void assembler::assemble_end_switch(const instruction::ptr& inst)
             else
             {
                 script_->write<uint32_t>(i + 1);
-                stack_->write_c_string(utils::string::unquote(inst->data[1 + (3 * i) + 1]));
+                stack_->write_c_string(inst->data[1 + (3 * i) + 1]);
             }
 
             index += 4;
diff --git a/src/iw7/xsk/assembler.cpp b/src/iw7/xsk/assembler.cpp
index 291d3b26..7932fcb0 100644
--- a/src/iw7/xsk/assembler.cpp
+++ b/src/iw7/xsk/assembler.cpp
@@ -259,19 +259,19 @@ void assembler::assemble_instruction(const instruction::ptr& inst)
         case opcode::OP_GetIString:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
             script_->write<std::uint32_t>(0);
-            stack_->write_c_string(utils::string::to_code(inst->data[0]));
+            stack_->write_c_string(inst->data[0]);
             break;
         case opcode::OP_GetAnimation:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
             script_->write<std::uint32_t>(0);
             script_->write<std::uint32_t>(0);
-            stack_->write_c_string(utils::string::unquote(inst->data[0]));
-            stack_->write_c_string(utils::string::unquote(inst->data[1]));
+            stack_->write_c_string(inst->data[0]);
+            stack_->write_c_string(inst->data[1]);
             break;
         case opcode::OP_GetAnimTree:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
             script_->write<std::uint8_t>(0);
-            stack_->write_c_string(utils::string::unquote(inst->data[0]));
+            stack_->write_c_string(inst->data[0]);
             break;
         case opcode::OP_waittillmatch:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
@@ -467,7 +467,7 @@ void assembler::assemble_end_switch(const instruction::ptr& inst)
             else
             {
                 script_->write<uint32_t>(i + 1);
-                stack_->write_c_string(utils::string::unquote(inst->data[1 + (3 * i) + 1]));
+                stack_->write_c_string(inst->data[1 + (3 * i) + 1]);
             }
 
             index += 4;
diff --git a/src/iw8/xsk/assembler.cpp b/src/iw8/xsk/assembler.cpp
index 138f2e7f..b096d81a 100644
--- a/src/iw8/xsk/assembler.cpp
+++ b/src/iw8/xsk/assembler.cpp
@@ -272,19 +272,19 @@ void assembler::assemble_instruction(const instruction::ptr& inst)
         case opcode::OP_GetIString:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
             script_->write<std::uint32_t>(0);
-            stack_->write_c_string(utils::string::to_code(inst->data[0]));
+            stack_->write_c_string(inst->data[0]);
             break;
         case opcode::OP_GetAnimation:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
             script_->write<std::uint32_t>(0);
             script_->write<std::uint32_t>(0);
-            stack_->write_c_string(utils::string::unquote(inst->data[0]));
-            stack_->write_c_string(utils::string::unquote(inst->data[1]));
+            stack_->write_c_string(inst->data[0]);
+            stack_->write_c_string(inst->data[1]);
             break;
         case opcode::OP_GetAnimTree:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
             script_->write<std::uint8_t>(0);
-            stack_->write_c_string(utils::string::unquote(inst->data[0]));
+            stack_->write_c_string(inst->data[0]);
             break;
         case opcode::OP_waittillmatch:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
@@ -522,7 +522,7 @@ void assembler::assemble_end_switch(const instruction::ptr& inst)
             else
             {
                 script_->write<uint32_t>(i + 1);
-                stack_->write_c_string(utils::string::unquote(inst->data[1 + (3 * i) + 1]));
+                stack_->write_c_string(inst->data[1 + (3 * i) + 1]);
             }
 
             index += 4;
diff --git a/src/s1/xsk/assembler.cpp b/src/s1/xsk/assembler.cpp
index 5a28f998..a08d54c2 100644
--- a/src/s1/xsk/assembler.cpp
+++ b/src/s1/xsk/assembler.cpp
@@ -260,19 +260,19 @@ void assembler::assemble_instruction(const instruction::ptr& inst)
         case opcode::OP_GetIString:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
             script_->write<std::uint32_t>(0);
-            stack_->write_c_string(utils::string::to_code(inst->data[0]));
+            stack_->write_c_string(inst->data[0]);
             break;
         case opcode::OP_GetAnimation:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
             script_->write<std::uint32_t>(0);
             script_->write<std::uint32_t>(0);
-            stack_->write_c_string(utils::string::unquote(inst->data[0]));
-            stack_->write_c_string(utils::string::unquote(inst->data[1]));
+            stack_->write_c_string(inst->data[0]);
+            stack_->write_c_string(inst->data[1]);
             break;
         case opcode::OP_GetAnimTree:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
             script_->write<std::uint8_t>(0);
-            stack_->write_c_string(utils::string::unquote(inst->data[0]));
+            stack_->write_c_string(inst->data[0]);
             break;
         case opcode::OP_waittillmatch:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
@@ -468,7 +468,7 @@ void assembler::assemble_end_switch(const instruction::ptr& inst)
             else
             {
                 script_->write<uint32_t>(i + 1);
-                stack_->write_c_string(utils::string::unquote(inst->data[1 + (3 * i) + 1]));
+                stack_->write_c_string(inst->data[1 + (3 * i) + 1]);
             }
 
             index += 4;
diff --git a/src/s2/xsk/assembler.cpp b/src/s2/xsk/assembler.cpp
index 3e7f168f..a97c3b55 100644
--- a/src/s2/xsk/assembler.cpp
+++ b/src/s2/xsk/assembler.cpp
@@ -261,19 +261,19 @@ void assembler::assemble_instruction(const instruction::ptr& inst)
         case opcode::OP_GetIString:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
             script_->write<std::uint32_t>(0);
-            stack_->write_c_string(utils::string::to_code(inst->data[0]));
+            stack_->write_c_string(inst->data[0]);
             break;
         case opcode::OP_GetAnimation:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
             script_->write<std::uint32_t>(0);
             script_->write<std::uint32_t>(0);
-            stack_->write_c_string(utils::string::unquote(inst->data[0]));
-            stack_->write_c_string(utils::string::unquote(inst->data[1]));
+            stack_->write_c_string(inst->data[0]);
+            stack_->write_c_string(inst->data[1]);
             break;
         case opcode::OP_GetAnimTree:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
             script_->write<std::uint8_t>(0);
-            stack_->write_c_string(utils::string::unquote(inst->data[0]));
+            stack_->write_c_string(inst->data[0]);
             break;
         case opcode::OP_waittillmatch:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
@@ -469,7 +469,7 @@ void assembler::assemble_end_switch(const instruction::ptr& inst)
             else
             {
                 script_->write<uint32_t>(i + 1);
-                stack_->write_c_string(utils::string::unquote(inst->data[1 + (3 * i) + 1]));
+                stack_->write_c_string(inst->data[1 + (3 * i) + 1]);
             }
 
             index += 4;
diff --git a/src/s4/xsk/assembler.cpp b/src/s4/xsk/assembler.cpp
index eb166cfc..822c783c 100644
--- a/src/s4/xsk/assembler.cpp
+++ b/src/s4/xsk/assembler.cpp
@@ -272,19 +272,19 @@ void assembler::assemble_instruction(const instruction::ptr& inst)
         case opcode::OP_GetIString:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
             script_->write<std::uint32_t>(0);
-            stack_->write_c_string(utils::string::to_code(inst->data[0]));
+            stack_->write_c_string(inst->data[0]);
             break;
         case opcode::OP_GetAnimation:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
             script_->write<std::uint32_t>(0);
             script_->write<std::uint32_t>(0);
-            stack_->write_c_string(utils::string::unquote(inst->data[0]));
-            stack_->write_c_string(utils::string::unquote(inst->data[1]));
+            stack_->write_c_string(inst->data[0]);
+            stack_->write_c_string(inst->data[1]);
             break;
         case opcode::OP_GetAnimTree:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
             script_->write<std::uint8_t>(0);
-            stack_->write_c_string(utils::string::unquote(inst->data[0]));
+            stack_->write_c_string(inst->data[0]);
             break;
         case opcode::OP_waittillmatch:
             script_->write<std::uint8_t>(static_cast<std::uint8_t>(inst->opcode));
@@ -522,7 +522,7 @@ void assembler::assemble_end_switch(const instruction::ptr& inst)
             else
             {
                 script_->write<uint32_t>(i + 1);
-                stack_->write_c_string(utils::string::unquote(inst->data[1 + (3 * i) + 1]));
+                stack_->write_c_string(inst->data[1 + (3 * i) + 1]);
             }
 
             index += 4;
diff --git a/src/t6/xsk/assembler.cpp b/src/t6/xsk/assembler.cpp
index 069cb39a..22384f21 100644
--- a/src/t6/xsk/assembler.cpp
+++ b/src/t6/xsk/assembler.cpp
@@ -797,7 +797,7 @@ void assembler::process_instruction(const instruction::ptr& inst)
                 {
                     if (!utils::string::is_number(inst->data[1 + (3 * i) + 1]))
                     {
-                        process_string(utils::string::unquote(inst->data[1 + (3 * i) + 1]));
+                        process_string(inst->data[1 + (3 * i) + 1]);
                     }
                 }
             }