diff --git a/SHADE_Managed/src/Editor/Editor.cxx b/SHADE_Managed/src/Editor/Editor.cxx
index 8b53db1b..e10111c3 100644
--- a/SHADE_Managed/src/Editor/Editor.cxx
+++ b/SHADE_Managed/src/Editor/Editor.cxx
@@ -81,7 +81,8 @@ namespace SHADE
                     // Add the script
                     Script^ script;
                     ScriptStore::AddScriptViaNameWithRef(entity, type->Name, script);
-                    registerUndoScriptAddAction(entity, script);
+                    // TODO: Re-enable when undo-redo is fixed
+                    // registerUndoScriptAddAction(entity, script);
                     break;
                 }
             }
@@ -374,8 +375,9 @@ namespace SHADE
             if (SHEditorUI::Selectable("Delete Script", ICON_MD_DELETE))
             {
                 // Mark script for removal
-                ScriptStore::RemoveScript(entity, script);
-                registerUndoScriptRemoveAction(entity, script, scriptIndex);
+                ScriptStore::RemoveScript(entity, script);                
+                // TODO: Re-enable when undo-redo is fixed
+                // registerUndoScriptRemoveAction(entity, script, scriptIndex);
             }
             SHEditorUI::EndPopup();
         }
diff --git a/SHADE_Managed/src/Serialisation/SerialisationUtilities.cxx b/SHADE_Managed/src/Serialisation/SerialisationUtilities.cxx
index d6f0f49c..b31209c1 100644
--- a/SHADE_Managed/src/Serialisation/SerialisationUtilities.cxx
+++ b/SHADE_Managed/src/Serialisation/SerialisationUtilities.cxx
@@ -91,8 +91,6 @@ namespace SHADE
         emitter << node;
         emitter << YAML::EndMap;
         return Convert::ToCLI(emitter.c_str());
-        /*std::string str = emitter.c_str();
-        return Convert::ToCLI(str.substr(2));*/
     }
 
     void SerialisationUtilities::Deserialise(Object^ object, YAML::Node& yamlNode)