diff --git a/make/saneVS/uox3.sln b/make/saneVS/uox3.sln
deleted file mode 100644
index 7666b71d6..000000000
--- a/make/saneVS/uox3.sln
+++ /dev/null
@@ -1,37 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.4.33122.133
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uox3", "uox3.vcxproj", "{062AE4B6-C989-4919-ADBF-7CD5A2CF30C5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jscript", "..\..\spidermonkey\make\vs2022\jscript\jscript.vcxproj", "{2AF3A5EA-0CEC-4D24-80F7-05E0B8B300C5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\zlib\make\vs2022\zlib.vcxproj", "{091529FD-5075-45F1-9D96-5708B3AB7C2B}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{062AE4B6-C989-4919-ADBF-7CD5A2CF30C5}.Debug|x64.ActiveCfg = Debug|x64
-		{062AE4B6-C989-4919-ADBF-7CD5A2CF30C5}.Debug|x64.Build.0 = Debug|x64
-		{062AE4B6-C989-4919-ADBF-7CD5A2CF30C5}.Release|x64.ActiveCfg = Release|x64
-		{062AE4B6-C989-4919-ADBF-7CD5A2CF30C5}.Release|x64.Build.0 = Release|x64
-		{2AF3A5EA-0CEC-4D24-80F7-05E0B8B300C5}.Debug|x64.ActiveCfg = Debug|x64
-		{2AF3A5EA-0CEC-4D24-80F7-05E0B8B300C5}.Debug|x64.Build.0 = Debug|x64
-		{2AF3A5EA-0CEC-4D24-80F7-05E0B8B300C5}.Release|x64.ActiveCfg = Release|x64
-		{2AF3A5EA-0CEC-4D24-80F7-05E0B8B300C5}.Release|x64.Build.0 = Release|x64
-		{091529FD-5075-45F1-9D96-5708B3AB7C2B}.Debug|x64.ActiveCfg = Debug|x64
-		{091529FD-5075-45F1-9D96-5708B3AB7C2B}.Debug|x64.Build.0 = Debug|x64
-		{091529FD-5075-45F1-9D96-5708B3AB7C2B}.Release|x64.ActiveCfg = Release|x64
-		{091529FD-5075-45F1-9D96-5708B3AB7C2B}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {CF21F62F-540E-4063-B542-B2421969D2C0}
-	EndGlobalSection
-EndGlobal
diff --git a/make/saneVS/uox3.vcxproj b/make/saneVS/uox3.vcxproj
deleted file mode 100644
index f24894f10..000000000
--- a/make/saneVS/uox3.vcxproj
+++ /dev/null
@@ -1,306 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectGuid>{062ae4b6-c989-4919-adbf-7cd5a2cf30c5}</ProjectGuid>
-    <RootNamespace>uox3</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;_CRT_NO_VA_START_VALIDATION;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;EXPORT_JS_API;_CRT_SECURE_NO_WARNINGS;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
-      <PrecompiledHeaderFile />
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalOptions> /J</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\source;..\..\zlib;..\..\spidermonkey</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;_CRT_NO_VA_START_VALIDATION;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;EXPORT_JS_API;_CRT_SECURE_NO_WARNINGS;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
-      <PrecompiledHeaderFile />
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalOptions> /J</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\source;..\..\zlib;..\..\spidermonkey</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-  
-    <ClCompile Include="..\..\source\uox3.cpp" />
- <!-- Script group -->   
-   <ClCompile Include="..\..\source\cServerData.cpp" />
-   <ClCompile Include="..\..\source\cServerDefinitions.cpp" />
-   <ClCompile Include="..\..\source\Dictionary.cpp" />
-   <ClCompile Include="..\..\source\scriptc.cpp" />
-   <ClCompile Include="..\..\source\ssection.cpp" />
-    
- <!-- Base Object group -->   
-   <ClCompile Include="..\..\source\boats.cpp" />
-   <ClCompile Include="..\..\source\cBaseobject.cpp" />
-   <ClCompile Include="..\..\source\cChar.cpp" />
-   <ClCompile Include="..\..\source\cConsole.cpp" />
-   <ClCompile Include="..\..\source\cGuild.cpp" />
-   <ClCompile Include="..\..\source\cItem.cpp" />
-   <ClCompile Include="..\..\source\cMultiObj.cpp" />
-   <ClCompile Include="..\..\source\cSocket.cpp" />
-   <ClCompile Include="..\..\source\cSpawnRegion.cpp" />
-   <ClCompile Include="..\..\source\cThreadQueue.cpp" />
-   <ClCompile Include="..\..\source\ObjectFactory.cpp" />
-   
-   
-<!-- Subsystem group -->    
-   <ClCompile Include="..\..\source\books.cpp" />
-   <ClCompile Include="..\..\source\cAccountClass.cpp" />
-   <ClCompile Include="..\..\source\CGump.cpp" />
-   <ClCompile Include="..\..\source\cHTMLSystem.cpp" />
-   <ClCompile Include="..\..\source\cmdtable.cpp" />
-   <ClCompile Include="..\..\source\combat.cpp" />
-   <ClCompile Include="..\..\source\commands.cpp" />
-   <ClCompile Include="..\..\source\cRaces.cpp" />
-   <ClCompile Include="..\..\source\cWeather.cpp" />
-   <ClCompile Include="..\..\source\gumps.cpp" />
-   <ClCompile Include="..\..\source\house.cpp" />
-   <ClCompile Include="..\..\source\items.cpp" />
-   <ClCompile Include="..\..\source\jail.cpp" />
-   <ClCompile Include="..\..\source\lineofsight.cpp" />
-   <ClCompile Include="..\..\source\magic.cpp" />
-   <ClCompile Include="..\..\source\movement.cpp" />
-   <ClCompile Include="..\..\source\msgboard.cpp" />
-   <ClCompile Include="..\..\source\PartySystem.cpp" />
-   <ClCompile Include="..\..\source\quantityfuncs.cpp" />
-   <ClCompile Include="..\..\source\queue.cpp" />
-   <ClCompile Include="..\..\source\regions.cpp" />
-   <ClCompile Include="..\..\source\skills.cpp" />
-   <ClCompile Include="..\..\source\sound.cpp" />
-   <ClCompile Include="..\..\source\speech.cpp" />
-   <ClCompile Include="..\..\source\targeting.cpp" />
-   <ClCompile Include="..\..\source\townregion.cpp" />
-   <ClCompile Include="..\..\source\trade.cpp" />
-   <ClCompile Include="..\..\source\vendor.cpp" />
-   <ClCompile Include="..\..\source\weight.cpp" />
-   <ClCompile Include="..\..\source\wholist.cpp" />
-   <ClCompile Include="..\..\source\worldmain.cpp" />
-
-
-<!-- Other group -->    
-   <ClCompile Include="..\..\source\ai.cpp" />
-   <ClCompile Include="..\..\source\archive.cpp" />
-   <ClCompile Include="..\..\source\calcfuncs.cpp" />
-   <ClCompile Include="..\..\source\cDice.cpp" />
-   <ClCompile Include="..\..\source\cPlayerAction.cpp" />
-   <ClCompile Include="..\..\source\CResponse.cpp" />
-   <ClCompile Include="..\..\source\cVersionClass.cpp" />
-   <ClCompile Include="..\..\source\dist.cpp" />
-   <ClCompile Include="..\..\source\effect.cpp" />
-   <ClCompile Include="..\..\source\fileio.cpp" />
-   <ClCompile Include="..\..\source\findfuncs.cpp" />
-   <ClCompile Include="..\..\source\npcs.cpp" />
-   <ClCompile Include="..\..\source\osunique.cpp" />
-   <ClCompile Include="..\..\source\pcmanage.cpp" />
-
-
-<!-- JS Engine group -->    
-   <ClCompile Include="..\..\source\CJSEngine.cpp" />
-   <ClCompile Include="..\..\source\CJSMapping.cpp" />
-   <ClCompile Include="..\..\source\cScript.cpp" />
-   <ClCompile Include="..\..\source\JSEncapsulate.cpp" />
-   <ClCompile Include="..\..\source\SEFunctions.cpp" />
-   <ClCompile Include="..\..\source\UOXJSMethods.cpp" />
-   <ClCompile Include="..\..\source\UOXJSPropertyFuncs.cpp" />
-
-<!-- Network group -->    
-   <ClCompile Include="..\..\source\CPacketReceive.cpp" />
-   <ClCompile Include="..\..\source\CPacketSend.cpp" />
-   <ClCompile Include="..\..\source\network.cpp" />
-   <ClCompile Include="..\..\source\IP4Address.cpp" />
-
-<!-- Utility group -->    
-   <ClCompile Include="..\..\source\StringUtility.cpp" />
-   <ClCompile Include="..\..\source\TimeUtility.cpp" />
-   <ClCompile Include="..\..\source\EventTimer.cpp" />
-
-<!-- UOData group -->    
-   <ClCompile Include="..\..\source\mapstuff.cpp" />
-   <ClCompile Include="..\..\source\MultiMul.cpp" />
-   <ClCompile Include="..\..\source\UOPData.cpp" />
-
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\source\uox3.h" />
-  
-  
-  <!-- Script group -->    
-    <ClInclude Include="..\..\source\cServerData.h" />
-    <ClInclude Include="..\..\source\cServerDefinitions.h" />
-    <ClInclude Include="..\..\source\Dictionary.h" />
-    <ClInclude Include="..\..\source\scriptc.h" />
-    <ClInclude Include="..\..\source\ssection.h" />
-
-  <!-- Base Object group -->    
-    <ClInclude Include="..\..\source\cBaseobject.h" />
-    <ClInclude Include="..\..\source\cChar.h" />
-    <ClInclude Include="..\..\source\cConsole.h" />
-    <ClInclude Include="..\..\source\cGuild.h" />
-    <ClInclude Include="..\..\source\cItem.h" />
-    <ClInclude Include="..\..\source\cMultiObj.h" />
-    <ClInclude Include="..\..\source\cSocket.h" />
-    <ClInclude Include="..\..\source\cSpawnRegion.h" />
-    <ClInclude Include="..\..\source\cThreadQueue.h" />
-    <ClInclude Include="..\..\source\funcdecl.h" />
-    <ClInclude Include="..\..\source\ObjectFactory.h" />
-    <ClInclude Include="..\..\source\PageVector.h" />
-    <ClInclude Include="..\..\source\uoxstruct.h" />
-  <!-- Subsystem group -->    
-    <ClInclude Include="..\..\source\books.h" />
-    <ClInclude Include="..\..\source\cAccountClass.h" />
-    <ClInclude Include="..\..\source\cEffects.h" />
-    <ClInclude Include="..\..\source\cHTMLSystem.h" />
-    <ClInclude Include="..\..\source\cMagic.h" />
-    <ClInclude Include="..\..\source\combat.h" />
-    <ClInclude Include="..\..\source\commands.h" />
-    <ClInclude Include="..\..\source\cRaces.h" />
-    <ClInclude Include="..\..\source\cWeather.hpp" />
-    <ClInclude Include="..\..\source\gump.h" />
-    <ClInclude Include="..\..\source\jail.h" />
-    <ClInclude Include="..\..\source\magic.h" />
-    <ClInclude Include="..\..\source\movement.h" />
-    <ClInclude Include="..\..\source\msgboard.h" />
-    <ClInclude Include="..\..\source\PartySystem.h" />
-    <ClInclude Include="..\..\source\regions.h" />
-    <ClInclude Include="..\..\source\skills.h" />
-    <ClInclude Include="..\..\source\speech.h" />
-    <ClInclude Include="..\..\source\teffect.h" />
-    <ClInclude Include="..\..\source\townregion.h" />
-    <ClInclude Include="..\..\source\weight.h" />
-    <ClInclude Include="..\..\source\wholist.h" />
-    <ClInclude Include="..\..\source\worldmain.h" />
-
-  <!-- Other group -->    
-    <ClInclude Include="..\..\source\cdice.h" />
-    <ClInclude Include="..\..\source\classes.h" />
-    <ClInclude Include="..\..\source\cmdtable.h" />
-    <ClInclude Include="..\..\source\ConfigOS.h" />
-    <ClInclude Include="..\..\source\CResponse.h" />
-    <ClInclude Include="..\..\source\cSkillClass.h" />
-    <ClInclude Include="..\..\source\cVersionClass.h" />
-    <ClInclude Include="..\..\source\enums.h" />
-    <ClInclude Include="..\..\source\GenericList.h" />
-    <ClInclude Include="..\..\source\osunique.hpp" />
-    <ClInclude Include="..\..\source\power.h" />
-    <ClInclude Include="..\..\source\Prerequisites.h" />
-    <ClInclude Include="..\..\source\typedefs.h" />
-    <ClInclude Include="..\..\source\UOXStdHeaders.h" />
-
-  <!-- JS Engine group -->    
-    <ClInclude Include="..\..\source\CJSEngine.h" />
-    <ClInclude Include="..\..\source\CJSMapping.h" />
-    <ClInclude Include="..\..\source\cScript.h" />
-    <ClInclude Include="..\..\source\JSEncapsulate.h" />
-    <ClInclude Include="..\..\source\SEFunctions.h" />
-    <ClInclude Include="..\..\source\UOXJSClasses.h" />
-    <ClInclude Include="..\..\source\UOXJSMethods.h" />
-    <ClInclude Include="..\..\source\UOXJSPropertyEnums.h" />
-    <ClInclude Include="..\..\source\UOXJSPropertyFuncs.h" />
-    <ClInclude Include="..\..\source\UOXJSPropertySpecs.h" />
-
-<!-- Network group -->    
-    <ClInclude Include="..\..\source\CPacketReceive.h" />
-    <ClInclude Include="..\..\source\CPacketSend.h" />
-    <ClInclude Include="..\..\source\network.h" />
-    <ClInclude Include="..\..\source\IP4Address.hpp" />
-
-<!-- Utility group -->    
-    <ClInclude Include="..\..\source\StringUtility.hpp" />
-    <ClInclude Include="..\..\source\TimeUtility.hpp" />
-    <ClInclude Include="..\..\source\EventTimer.hpp" />
-    
-<!-- UOData group -->    
-    <ClInclude Include="..\..\source\mapclasses.h" />
-    <ClInclude Include="..\..\source\mapstuff.h" />
-    <ClInclude Include="..\..\source\MultiMul.hpp" />
-    <ClInclude Include="..\..\source\UOPData.hpp" />
-
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="..\..\assets\uox3.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\assets\uox3.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\spidermonkey\make\vs2022\jscript\jscript.vcxproj">
-      <Project>{2af3a5ea-0cec-4d24-80f7-05e0b8b300c5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\zlib\make\vs2022\zlib.vcxproj">
-      <Project>{091529fd-5075-45f1-9d96-5708b3ab7c2b}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/make/saneVS/uox3.vcxproj.filters b/make/saneVS/uox3.vcxproj.filters
deleted file mode 100644
index 76b21229e..000000000
--- a/make/saneVS/uox3.vcxproj.filters
+++ /dev/null
@@ -1,583 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="Source Files\Base Objects">
-      <UniqueIdentifier>{cd40ad04-825d-48bb-9a86-ff3ee1b2925e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Subsystem">
-      <UniqueIdentifier>{f1c80722-7193-47b7-8c33-b900a0063ae4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Other">
-      <UniqueIdentifier>{803b199d-3be5-4df0-a1a3-606c8ee008df}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\JS Engine">
-      <UniqueIdentifier>{9070ad2d-6668-48f5-a867-d62bf7e1c2ce}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Network">
-      <UniqueIdentifier>{5dc0e64e-1161-4bdd-b7a9-08309a58eb14}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Script">
-      <UniqueIdentifier>{e69fb852-15bb-499d-a73e-13f7b97c87b5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\UOData">
-      <UniqueIdentifier>{5fcfac04-c4f0-4c48-804a-8b4f49e615c4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\UOData">
-      <UniqueIdentifier>{d191cb74-b6ab-4daa-9a7d-23c417c8efa5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Utility">
-      <UniqueIdentifier>{39d50936-dc83-4b6c-b219-2f79d292d75b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Utility">
-      <UniqueIdentifier>{6a0862ae-8f52-4d2e-bac1-51e13e865632}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Base Objects">
-      <UniqueIdentifier>{9a0e0d95-1028-413d-916f-c79b93d05203}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\JS Engine">
-      <UniqueIdentifier>{d08079d3-ca4f-47c2-834e-b2982e2cc5d2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Network">
-      <UniqueIdentifier>{6120db4f-bb2e-449f-b847-1547b395dee6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Other">
-      <UniqueIdentifier>{b53b55e3-1e33-4ebf-a60f-a7e98258942c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Subsystem">
-      <UniqueIdentifier>{4e9f44ee-ffe6-4241-9ba9-faa06b8bcd9b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Script">
-      <UniqueIdentifier>{47123d74-35f3-41ba-b7ee-c4d15af5c6af}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="..\..\assets\uox3.ico">
-      <Filter>Resource Files</Filter>
-    </Image>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\source\uox3.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-<!-- Script group -->    
-    <ClCompile Include="..\..\source\cServerData.cpp">
-      <Filter>Source Files\Script</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\cServerDefinitions.cpp">
-      <Filter>Source Files\Script</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\Dictionary.cpp">
-      <Filter>Source Files\Script</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\scriptc.cpp">
-      <Filter>Source Files\Script</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\ssection.cpp">
-      <Filter>Source Files\Script</Filter>
-    </ClCompile>
-    
-<!-- Base Objects group -->    
-    <ClCompile Include="..\..\source\boats.cpp">
-      <Filter>Source Files\Base Objects</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\cBaseobject.cpp">
-      <Filter>Source Files\Base Objects</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\cChar.cpp">
-      <Filter>Source Files\Base Objects</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\cConsole.cpp">
-      <Filter>Source Files\Base Objects</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\cGuild.cpp">
-      <Filter>Source Files\Base Objects</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\cItem.cpp">
-      <Filter>Source Files\Base Objects</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\cMultiObj.cpp">
-      <Filter>Source Files\Base Objects</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\cSocket.cpp">
-      <Filter>Source Files\Base Objects</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\cSpawnRegion.cpp">
-      <Filter>Source Files\Base Objects</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\cThreadQueue.cpp">
-      <Filter>Source Files\Base Objects</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\ObjectFactory.cpp">
-      <Filter>Source Files\Base Objects</Filter>
-    </ClCompile>
-    
-<!-- Subsystem group -->    
-    <ClCompile Include="..\..\source\books.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\cAccountClass.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\CGump.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\cHTMLSystem.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\cmdtable.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\combat.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\commands.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\cRaces.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\cWeather.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\gumps.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\house.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\items.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\jail.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\lineofsight.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\magic.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\movement.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\msgboard.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\PartySystem.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\quantityfuncs.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\queue.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\regions.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\skills.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\sound.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\speech.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\targeting.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\townregion.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\trade.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\vendor.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\weight.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\wholist.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\worldmain.cpp">
-      <Filter>Source Files\Subsystem</Filter>
-    </ClCompile>
-    
-<!-- Other group -->    
-    <ClCompile Include="..\..\source\ai.cpp">
-      <Filter>Source Files\Other</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\archive.cpp">
-      <Filter>Source Files\Other</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\calcfuncs.cpp">
-      <Filter>Source Files\Other</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\cDice.cpp">
-      <Filter>Source Files\Other</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\cPlayerAction.cpp">
-      <Filter>Source Files\Other</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\CResponse.cpp">
-      <Filter>Source Files\Other</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\cVersionClass.cpp">
-      <Filter>Source Files\Other</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\dist.cpp">
-      <Filter>Source Files\Other</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\effect.cpp">
-      <Filter>Source Files\Other</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\fileio.cpp">
-      <Filter>Source Files\Other</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\findfuncs.cpp">
-      <Filter>Source Files\Other</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\npcs.cpp">
-      <Filter>Source Files\Other</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\osunique.cpp">
-      <Filter>Source Files\Other</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\pcmanage.cpp">
-      <Filter>Source Files\Other</Filter>
-    </ClCompile>
-    
-<!-- JS Engine group -->    
-    <ClCompile Include="..\..\source\CJSEngine.cpp">
-      <Filter>Source Files\JS Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\CJSMapping.cpp">
-      <Filter>Source Files\JS Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\cScript.cpp">
-      <Filter>Source Files\JS Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\JSEncapsulate.cpp">
-      <Filter>Source Files\JS Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\SEFunctions.cpp">
-      <Filter>Source Files\JS Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\UOXJSMethods.cpp">
-      <Filter>Source Files\JS Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\UOXJSPropertyFuncs.cpp">
-      <Filter>Source Files\JS Engine</Filter>
-    </ClCompile>
-    
-<!-- Network group -->    
-    <ClCompile Include="..\..\source\CPacketReceive.cpp">
-      <Filter>Source Files\Network</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\CPacketSend.cpp">
-      <Filter>Source Files\Network</Filter>
-    </ClCompile>   
-    <ClCompile Include="..\..\source\network.cpp">
-      <Filter>Source Files\Network</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\IP4Address.cpp">
-      <Filter>Source Files\Network</Filter>
-    </ClCompile>
-    
-<!-- Utility group -->    
-    <ClCompile Include="..\..\source\StringUtility.cpp">
-      <Filter>Source Files\Utility</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\TimeUtility.cpp">
-      <Filter>Source Files\Utility</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\EventTimer.cpp">
-      <Filter>Source Files\Utility</Filter>
-    </ClCompile>
-    
-    
-<!-- UOData group -->    
-    <ClCompile Include="..\..\source\mapstuff.cpp">
-      <Filter>Source Files\UOData</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\MultiMul.cpp">
-      <Filter>Source Files\UOData</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\UOPData.cpp">
-      <Filter>Source Files\UOData</Filter>
-    </ClCompile>
-
-  </ItemGroup>
-  
-  <ItemGroup>
-    <ClInclude Include="..\..\source\uox3.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-        
-<!-- Script group -->    
-    <ClInclude Include="..\..\source\cServerData.h">
-      <Filter>Header Files\Script</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\cServerDefinitions.h">
-      <Filter>Header Files\Script</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\Dictionary.h">
-      <Filter>Header Files\Script</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\scriptc.h">
-      <Filter>Header Files\Script</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\ssection.h">
-      <Filter>Header Files\Script</Filter>
-    </ClInclude>
-
-<!-- Base Objects group -->    
-    <ClInclude Include="..\..\source\cBaseObject.h">
-      <Filter>Header Files\Base Objects</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\cChar.h">
-      <Filter>Header Files\Base Objects</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\cConsole.h">
-      <Filter>Header Files\Base Objects</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\cGuild.h">
-      <Filter>Header Files\Base Objects</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\cItem.h">
-      <Filter>Header Files\Base Objects</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\cMultiObj.h">
-      <Filter>Header Files\Base Objects</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\cSocket.h">
-      <Filter>Header Files\Base Objects</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\cSpawnRegion.h">
-      <Filter>Header Files\Base Objects</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\cThreadQueue.h">
-      <Filter>Header Files\Base Objects</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\funcdecl.h">
-      <Filter>Header Files\Base Objects</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\ObjectFactory.h">
-      <Filter>Header Files\Base Objects</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\PageVector.h">
-      <Filter>Header Files\Base Objects</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\uoxstruct.h">
-      <Filter>Header Files\Base Objects</Filter>
-    </ClInclude>
-    
-<!-- Subsystem group -->    
-    <ClInclude Include="..\..\source\books.h">
-      <Filter>Header Files\Subsystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\cAccountClass.h">
-      <Filter>Header Files\Subsystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\cEffects.h">
-      <Filter>Header Files\Subsystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\cHTMLSystem.h">
-      <Filter>Header Files\Subsystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\cMagic.h">
-      <Filter>Header Files\Subsystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\combat.h">
-      <Filter>Header Files\Subsystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\commands.h">
-      <Filter>Header Files\Subsystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\cRaces.h">
-      <Filter>Header Files\Subsystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\cWeather.hpp">
-      <Filter>Header Files\Subsystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\gump.h">
-      <Filter>Header Files\Subsystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\jail.h">
-      <Filter>Header Files\Subsystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\magic.h">
-      <Filter>Header Files\Subsystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\movement.h">
-      <Filter>Header Files\Subsystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\msgboard.h">
-      <Filter>Header Files\Subsystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\regions.h">
-      <Filter>Header Files\Subsystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\skills.h">
-      <Filter>Header Files\Subsystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\speech.h">
-      <Filter>Header Files\Subsystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\teffect.h">
-      <Filter>Header Files\Subsystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\townregion.h">
-      <Filter>Header Files\Other</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\weight.h">
-      <Filter>Header Files\Subsystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\wholist.h">
-      <Filter>Header Files\Subsystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\worldmain.h">
-      <Filter>Header Files\Subsystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\PartySystem.h">
-      <Filter>Header Files\Subsystem</Filter>
-    </ClInclude>
-    
-<!-- Other group -->    
-    <ClInclude Include="..\..\source\cdice.h">
-      <Filter>Header Files\Other</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\classes.h">
-      <Filter>Header Files\Other</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\cmdtable.h">
-      <Filter>Header Files\Other</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\ConfigOS.h">
-      <Filter>Header Files\Other</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\CResponse.h">
-      <Filter>Header Files\Other</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\cSkillClass.h">
-      <Filter>Header Files\Other</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\cVersionClass.h">
-      <Filter>Header Files\Other</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\enums.h">
-      <Filter>Header Files\Other</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\GenericList.h">
-      <Filter>Header Files\Other</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\osunique.hpp">
-      <Filter>Header Files\Other</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\power.h">
-      <Filter>Header Files\Other</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\Prerequisites.h">
-      <Filter>Header Files\Other</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\typedefs.h">
-      <Filter>Header Files\Other</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\UOXStdHeaders.h">
-      <Filter>Header Files\Other</Filter>
-    </ClInclude>
-    
-<!-- JS Engine group -->    
-    <ClInclude Include="..\..\source\CJSEngine.h">
-      <Filter>Header Files\JS Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\CJSMapping.h">
-      <Filter>Header Files\JS Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\cScript.h">
-      <Filter>Header Files\JS Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\JSEncapsulate.h">
-      <Filter>Header Files\JS Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\SEFunctions.h">
-      <Filter>Header Files\JS Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\UOXJSClasses.h">
-      <Filter>Header Files\JS Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\UOXJSMethods.h">
-      <Filter>Header Files\JS Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\UOXJSPropertyEnums.h">
-      <Filter>Header Files\JS Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\UOXJSPropertyFuncs.h">
-      <Filter>Header Files\JS Engine</Filter>
-    </ClInclude>
-     <ClInclude Include="..\..\source\UOXJSPropertySpecs.h">
-      <Filter>Header Files\JS Engine</Filter>
-    </ClInclude>
-   
-<!-- Network group -->    
-    <ClInclude Include="..\..\source\CPacketReceive.h">
-      <Filter>Header Files\Network</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\CPacketSend.h">
-      <Filter>Header Files\Network</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\network.h">
-      <Filter>Header Files\Network</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\IP4Address.hpp">
-      <Filter>Header Files\Network</Filter>
-    </ClInclude>
-    
-    
-<!-- Utility group -->    
-    <ClInclude Include="..\..\source\StringUtility.hpp">
-      <Filter>Header Files\Utility</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\TimeUtility.hpp">
-      <Filter>Header Files\Utility</Filter>
-    </ClInclude>
-     <ClInclude Include="..\..\source\EventTimer.hpp">
-      <Filter>Header Files\Utility</Filter>
-    </ClInclude>
-    
-<!-- UOData group -->    
-    <ClInclude Include="..\..\source\mapstuff.h">
-      <Filter>Header Files\UOData</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\mapclasses.h">
-      <Filter>Header Files\UOData</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\MultiMul.hpp">
-      <Filter>Header Files\UOData</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\UOPData.hpp">
-      <Filter>Header Files\UOData</Filter>
-    </ClInclude>
-   
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\assets\uox3.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/spidermonkey/make/XCode/jscript/jscript.xcodeproj/project.pbxproj b/spidermonkey/make/XCode/jscript/jscript.xcodeproj/project.pbxproj
index 288bd9762..cc574c97c 100644
--- a/spidermonkey/make/XCode/jscript/jscript.xcodeproj/project.pbxproj
+++ b/spidermonkey/make/XCode/jscript/jscript.xcodeproj/project.pbxproj
@@ -1046,6 +1046,7 @@
 		56BA2FAB2A95B9990064EB36 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_WARN_COMMA = NO;
 				CODE_SIGN_STYLE = Automatic;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = CF264WE69M;
@@ -1062,6 +1063,7 @@
 		56BA2FAC2A95B9990064EB36 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_WARN_COMMA = NO;
 				CODE_SIGN_STYLE = Automatic;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = CF264WE69M;