From cfa79c4dc7dcac628c2fc7983ab062e4cf9639f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro?= <jpedrolmail@gmail.com>
Date: Sat, 26 Aug 2017 22:45:33 +0100
Subject: [PATCH] Move Cosmos.Debug.Symbols to IL2CPU.

---
 Build.sln                                     |   2 +-
 IDE.sln                                       |   2 +-
 Kernel.sln                                    |   2 +-
 Test.sln                                      |   2 +-
 .../BochsSupport.cs                           |   2 +-
 .../Cosmos.Build.MSBuild.csproj               |   3 +-
 .../ExtractMapFromElfFile.cs                  |   2 +-
 .../Cosmos.Debug.Common.csproj                |   2 +-
 source/Cosmos.Debug.Common/ObjDump.cs         | 137 ---
 .../Cosmos.Debug.Hosts/Bochs.Configuration.cs |   1 +
 .../Cosmos.Debug.Hosts.csproj                 |   2 +-
 source/Cosmos.Debug.Symbols/CacheHelper.cs    |  35 -
 .../Cosmos.Debug.Symbols.csproj               |  30 -
 source/Cosmos.Debug.Symbols/DebugInfo.cs      | 836 ------------------
 source/Cosmos.Debug.Symbols/DebugModel.cs     | 459 ----------
 .../Cosmos.Debug.Symbols/DebugSymbolReader.cs | 322 -------
 .../Hashing/TypeHashingAlgorithms.cs          | 251 ------
 source/Cosmos.Debug.Symbols/ITokenResolver.cs |  23 -
 .../LocalTypeGenericContext.cs                |  17 -
 .../Cosmos.Debug.Symbols/LocalTypeProvider.cs | 177 ----
 .../Metadata/CachingMetadataStringDecoder.cs  | 193 ----
 .../Metadata/MetadataHelper.cs                | 105 ---
 .../Cosmos.Debug.Symbols/ModuleExtensions.cs  |  37 -
 .../ModuleScopeTokenResolver.cs               |  34 -
 source/Cosmos.Debug.Symbols/ObjectReader.cs   | 253 ------
 .../Pdb/ILLocalVariable.cs                    |  28 -
 .../Pdb/ILSequencePoint.cs                    |  26 -
 .../Pdb/PdbSymbolReader.cs                    |  19 -
 .../Pdb/PortablePdbSymbolReader.cs            | 151 ----
 .../Pdb/UnmanagedPdbSymbolReader.cs           | 274 ------
 source/Cosmos.Debug.Symbols/SQL.cs            |  93 --
 source/Cosmos.Debug.Symbols/SQLite.sql        |  93 --
 source/Cosmos.Debug.Symbols/SQLiteIndexes.sql |  26 -
 source/Cosmos.Debug.Symbols/SourceInfo.cs     |  27 -
 source/Cosmos.Debug.Symbols/SqliteBulkCopy.cs |  75 --
 .../Cosmos.VS.DebugEngine.csproj              |   2 +-
 .../Cosmos.VS.ProjectSystem/ProfilePresets.cs |   4 +-
 37 files changed, 13 insertions(+), 3734 deletions(-)
 rename source/{Cosmos.Debug.Common => Cosmos.Build.Common}/BochsSupport.cs (99%)
 delete mode 100644 source/Cosmos.Debug.Common/ObjDump.cs
 delete mode 100644 source/Cosmos.Debug.Symbols/CacheHelper.cs
 delete mode 100644 source/Cosmos.Debug.Symbols/Cosmos.Debug.Symbols.csproj
 delete mode 100644 source/Cosmos.Debug.Symbols/DebugInfo.cs
 delete mode 100644 source/Cosmos.Debug.Symbols/DebugModel.cs
 delete mode 100644 source/Cosmos.Debug.Symbols/DebugSymbolReader.cs
 delete mode 100644 source/Cosmos.Debug.Symbols/Hashing/TypeHashingAlgorithms.cs
 delete mode 100644 source/Cosmos.Debug.Symbols/ITokenResolver.cs
 delete mode 100644 source/Cosmos.Debug.Symbols/LocalTypeGenericContext.cs
 delete mode 100644 source/Cosmos.Debug.Symbols/LocalTypeProvider.cs
 delete mode 100644 source/Cosmos.Debug.Symbols/Metadata/CachingMetadataStringDecoder.cs
 delete mode 100644 source/Cosmos.Debug.Symbols/Metadata/MetadataHelper.cs
 delete mode 100644 source/Cosmos.Debug.Symbols/ModuleExtensions.cs
 delete mode 100644 source/Cosmos.Debug.Symbols/ModuleScopeTokenResolver.cs
 delete mode 100644 source/Cosmos.Debug.Symbols/ObjectReader.cs
 delete mode 100644 source/Cosmos.Debug.Symbols/Pdb/ILLocalVariable.cs
 delete mode 100644 source/Cosmos.Debug.Symbols/Pdb/ILSequencePoint.cs
 delete mode 100644 source/Cosmos.Debug.Symbols/Pdb/PdbSymbolReader.cs
 delete mode 100644 source/Cosmos.Debug.Symbols/Pdb/PortablePdbSymbolReader.cs
 delete mode 100644 source/Cosmos.Debug.Symbols/Pdb/UnmanagedPdbSymbolReader.cs
 delete mode 100644 source/Cosmos.Debug.Symbols/SQL.cs
 delete mode 100644 source/Cosmos.Debug.Symbols/SQLite.sql
 delete mode 100644 source/Cosmos.Debug.Symbols/SQLiteIndexes.sql
 delete mode 100644 source/Cosmos.Debug.Symbols/SourceInfo.cs
 delete mode 100644 source/Cosmos.Debug.Symbols/SqliteBulkCopy.cs

diff --git a/Build.sln b/Build.sln
index 80458195e5..4073c99fef 100644
--- a/Build.sln
+++ b/Build.sln
@@ -52,7 +52,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2CPU", "..\IL2CPU\source\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.IL2CPU", "..\IL2CPU\source\Cosmos.IL2CPU\Cosmos.IL2CPU.csproj", "{3C45A898-4AA9-476F-8302-63391D6ED044}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Debug.Symbols", "source\Cosmos.Debug.Symbols\Cosmos.Debug.Symbols.csproj", "{2E740096-911F-47D0-A46D-998DBB76FC5D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Debug.Symbols", "..\IL2CPU\source\Cosmos.Debug.Symbols\Cosmos.Debug.Symbols.csproj", "{2E740096-911F-47D0-A46D-998DBB76FC5D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Debug.DebugConnectors", "source\Cosmos.Debug.DebugConnectors\Cosmos.Debug.DebugConnectors.csproj", "{BC91BCEF-D146-4EB0-BE63-C637880C5800}"
 EndProject
diff --git a/IDE.sln b/IDE.sln
index 926d3a65dd..e037ab0d2f 100644
--- a/IDE.sln
+++ b/IDE.sln
@@ -22,7 +22,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Debug.GDB", "source\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Debug.Hosts", "source\Cosmos.Debug.Hosts\Cosmos.Debug.Hosts.csproj", "{C9826909-2E5E-4453-93FA-B6BE4503DF02}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Debug.Symbols", "source\Cosmos.Debug.Symbols\Cosmos.Debug.Symbols.csproj", "{ECC4319F-A844-45B8-BF63-2FD04F05E56A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Debug.Symbols", "..\IL2CPU\source\Cosmos.Debug.Symbols\Cosmos.Debug.Symbols.csproj", "{ECC4319F-A844-45B8-BF63-2FD04F05E56A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Deploy.Pixie", "source\Cosmos.Deploy.Pixie\Cosmos.Deploy.Pixie.csproj", "{D4BA64B3-D7F6-4A3A-AF1D-74E41B49D865}"
 EndProject
diff --git a/Kernel.sln b/Kernel.sln
index cdac43af7b..976904e6aa 100644
--- a/Kernel.sln
+++ b/Kernel.sln
@@ -72,7 +72,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.IL2CPU", "..\IL2CPU\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Build.Common", "source\Cosmos.Build.Common\Cosmos.Build.Common.csproj", "{67FD9912-CE63-4EB2-880C-F4F0D9AED7CA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Debug.Symbols", "source\Cosmos.Debug.Symbols\Cosmos.Debug.Symbols.csproj", "{4E9B8F31-AEA0-402D-9B3A-223100F2156D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Debug.Symbols", "..\IL2CPU\source\Cosmos.Debug.Symbols\Cosmos.Debug.Symbols.csproj", "{4E9B8F31-AEA0-402D-9B3A-223100F2156D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Plugs.TapRoot", "source\Kernel-X86\91-Plugs\Cosmos.Plugs.TapRoot\Cosmos.Plugs.TapRoot.csproj", "{BEEDA0BE-0105-40BF-BD8D-7F6A2BC3B05C}"
 EndProject
diff --git a/Test.sln b/Test.sln
index 90a6380710..c8fedd0e6d 100644
--- a/Test.sln
+++ b/Test.sln
@@ -30,7 +30,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Core.DebugStub", "so
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Debug.Hosts", "source\Cosmos.Debug.Hosts\Cosmos.Debug.Hosts.csproj", "{C9826909-2E5E-4453-93FA-B6BE4503DF02}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Debug.Symbols", "source\Cosmos.Debug.Symbols\Cosmos.Debug.Symbols.csproj", "{ECC4319F-A844-45B8-BF63-2FD04F05E56A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Debug.Symbols", "..\IL2CPU\source\Cosmos.Debug.Symbols\Cosmos.Debug.Symbols.csproj", "{ECC4319F-A844-45B8-BF63-2FD04F05E56A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.HAL2", "source\Cosmos.HAL2\Cosmos.HAL2.csproj", "{1425715D-1C93-44C7-8BB5-F124F195A41A}"
 EndProject
diff --git a/source/Cosmos.Debug.Common/BochsSupport.cs b/source/Cosmos.Build.Common/BochsSupport.cs
similarity index 99%
rename from source/Cosmos.Debug.Common/BochsSupport.cs
rename to source/Cosmos.Build.Common/BochsSupport.cs
index 2d0d425ab7..df125fac41 100644
--- a/source/Cosmos.Debug.Common/BochsSupport.cs
+++ b/source/Cosmos.Build.Common/BochsSupport.cs
@@ -6,7 +6,7 @@
 
 using Microsoft.Win32;
 
-namespace Cosmos.Debug.Common
+namespace Cosmos.Build.Common
 {
     /// <summary>An helper class that is used from both Cosmos.VS.ProjectSystem and Cosmos.VS.DebugEngine for
     /// Bochs emulator support.</summary>
diff --git a/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj b/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj
index 09a2d73241..20bad6bd47 100644
--- a/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj
+++ b/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj
@@ -23,8 +23,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Cosmos.Build.Common\Cosmos.Build.Common.csproj" />
-    <ProjectReference Include="..\Cosmos.Debug.Common\Cosmos.Debug.Common.csproj" />
-    <ProjectReference Include="..\Cosmos.Debug.Symbols\Cosmos.Debug.Symbols.csproj" />
+    <ProjectReference Include="..\..\..\IL2CPU\source\Cosmos.Debug.Symbols\Cosmos.Debug.Symbols.csproj" />
   </ItemGroup>
   
   <Target Name="ExcludeSystemDataCommon" AfterTargets="ImplicitlyExpandNETStandardFacades">
diff --git a/source/Cosmos.Build.MSBuild/ExtractMapFromElfFile.cs b/source/Cosmos.Build.MSBuild/ExtractMapFromElfFile.cs
index f5da8b5179..bde78a2855 100644
--- a/source/Cosmos.Build.MSBuild/ExtractMapFromElfFile.cs
+++ b/source/Cosmos.Build.MSBuild/ExtractMapFromElfFile.cs
@@ -3,7 +3,7 @@
 using System.IO;
 using Microsoft.Build.Framework;
 
-using Cosmos.Debug.Common;
+using Cosmos.Debug.Symbols;
 
 namespace Cosmos.Build.MSBuild {
     public class ExtractMapFromElfFile : BaseToolTask {
diff --git a/source/Cosmos.Debug.Common/Cosmos.Debug.Common.csproj b/source/Cosmos.Debug.Common/Cosmos.Debug.Common.csproj
index 0cbffc634a..5271b00633 100644
--- a/source/Cosmos.Debug.Common/Cosmos.Debug.Common.csproj
+++ b/source/Cosmos.Debug.Common/Cosmos.Debug.Common.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Cosmos.Debug.Symbols\Cosmos.Debug.Symbols.csproj" />
+        <ProjectReference Include="..\..\..\IL2CPU\source\Cosmos.Debug.Symbols\Cosmos.Debug.Symbols.csproj" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/source/Cosmos.Debug.Common/ObjDump.cs b/source/Cosmos.Debug.Common/ObjDump.cs
deleted file mode 100644
index 4c05cd21d0..0000000000
--- a/source/Cosmos.Debug.Common/ObjDump.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.IO;
-
-using Cosmos.Debug.Symbols;
-
-namespace Cosmos.Debug.Common
-{
-    public class ObjDump
-    {
-        [Obsolete("We're not using ELF Format anymore")]
-        public static SortedList<uint, string> GetLabelByAddressMapping(string aKernel, string aObjDumpExe)
-        {
-            string[] xSymbolsContents;
-            #region Run ObjDump
-            string xTempFile = Path.GetTempFileName();
-            var xRandom = new Random(78367);
-            string xBatFile = String.Empty;
-            do
-            {
-                xBatFile = Path.GetTempPath();
-                xBatFile = Path.Combine(xBatFile, BitConverter.GetBytes(xRandom.NextDouble()).Aggregate<byte, string>("", (r, b) => r += b.ToString("X2").ToUpper()) + ".bat");
-            } while (File.Exists(xBatFile));
-            string xObjDumpFile = aObjDumpExe;
-            File.WriteAllText(xBatFile, String.Format("@ECHO OFF\r\n\"{0}\" --syms --wide \"{1}\" > \"{2}\"", xObjDumpFile, aKernel, xTempFile));
-            using (var xProcess = Process.Start(xBatFile))
-            {
-                xProcess.WaitForExit();
-            }
-            xSymbolsContents = File.ReadAllLines(xTempFile);
-            File.Delete(xTempFile);
-            File.Delete(xBatFile);
-            #endregion
-
-            var xResult = new SortedList<uint, string>();
-            foreach (var xLabel in ExtractMapSymbolsForElfFile(xSymbolsContents))
-            {
-                xResult.Add((uint)xLabel.Address, xLabel.Name);
-            }
-            return xResult;
-        }
-
-        /// <summary>
-        /// Sequentially parse symbols from the lines sequence.
-        /// </summary>
-        /// <param name="lines">Sequence of lines which contain map files.</param>
-        /// <returns>Sequence of parsed label.</returns>
-        public static IEnumerable<Label> ExtractMapSymbolsForElfFile(IEnumerable<string> lines)
-        {
-            bool xListStarted = false;
-            foreach (var xLine in lines)
-            {
-                if (String.IsNullOrEmpty(xLine))
-                {
-                    continue;
-                }
-                else if (!xListStarted)
-                {
-                    // Find start of the data
-                    if (xLine == "SYMBOL TABLE:")
-                    {
-                        xListStarted = true;
-                    }
-                    continue;
-                }
-
-                uint xAddress;
-                try
-                {
-                    xAddress = UInt32.Parse(xLine.Substring(0, 8), System.Globalization.NumberStyles.HexNumber);
-                }
-                catch (Exception ex)
-                {
-                    throw new InvalidDataException("Error processing line '" + xLine + "' " + ex.Message);
-                }
-
-                string xSection = xLine.Substring(17, 5);
-                if (xSection != ".text" && xSection != ".data")
-                {
-                    continue;
-                }
-                string xLabel = xLine.Substring(32);
-                if (xLabel == xSection)
-                {
-                    // Non label, skip
-                    continue;
-                }
-
-                long xGuid;
-                // See if label has an embedded GUID. If so, use it.
-                if (xLabel.StartsWith("GUID_"))
-                {
-                    xGuid = long.Parse(xLabel.Substring(5));
-                }
-                else
-                {
-                    xGuid = DebugInfo.CreateId();
-                }
-
-                yield return new Label()
-                {
-                    ID = xGuid,
-                    Name = xLabel,
-                    Address = xAddress
-                };
-            }
-        }
-
-        /// <summary>
-        /// Extract symbols from the specified map file and populate debug database from that file.
-        /// </summary>
-        /// <param name="debugFile">Debug file to popuplate with symbols.</param>
-        /// <param name="mapFile">Map file from where sybols should be extracted.</param>
-        public static void ExtractMapSymbolsForElfFile(string debugFile, string mapFile)
-        {
-            DebugInfo.SetRange(DebugInfo.ElfFileMapExtractionRange);
-            using (var xDebugInfo = new DebugInfo(debugFile))
-            {
-                // In future instead of loading all labels, save indexes to major labels but not IL.ASM labels.
-                // Then code can find major lables, and use position markers into the map file to parse in between
-                // as needed.
-                var xLabels = new List<Label>();
-                var xFileLines = File.ReadLines(mapFile);
-                foreach (var xLabel in ExtractMapSymbolsForElfFile(xFileLines))
-                {
-                    xLabels.Add(xLabel);
-                    xDebugInfo.AddLabels(xLabels);
-                }
-
-                xDebugInfo.AddLabels(xLabels, true);
-                xDebugInfo.CreateIndexes();
-            }
-        }
-    }
-}
diff --git a/source/Cosmos.Debug.Hosts/Bochs.Configuration.cs b/source/Cosmos.Debug.Hosts/Bochs.Configuration.cs
index 810a037934..ebd0447a73 100644
--- a/source/Cosmos.Debug.Hosts/Bochs.Configuration.cs
+++ b/source/Cosmos.Debug.Hosts/Bochs.Configuration.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Text;
 
+using Cosmos.Build.Common;
 using Cosmos.Debug.Common;
 
 namespace Cosmos.Debug.Hosts
diff --git a/source/Cosmos.Debug.Hosts/Cosmos.Debug.Hosts.csproj b/source/Cosmos.Debug.Hosts/Cosmos.Debug.Hosts.csproj
index d47797922b..691d7e5afb 100644
--- a/source/Cosmos.Debug.Hosts/Cosmos.Debug.Hosts.csproj
+++ b/source/Cosmos.Debug.Hosts/Cosmos.Debug.Hosts.csproj
@@ -12,8 +12,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Cosmos.Debug.Common\Cosmos.Debug.Common.csproj" />
         <ProjectReference Include="..\Cosmos.Build.Common\Cosmos.Build.Common.csproj" />
+        <ProjectReference Include="..\Cosmos.Debug.Common\Cosmos.Debug.Common.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/source/Cosmos.Debug.Symbols/CacheHelper.cs b/source/Cosmos.Debug.Symbols/CacheHelper.cs
deleted file mode 100644
index f4a8b46b55..0000000000
--- a/source/Cosmos.Debug.Symbols/CacheHelper.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-
-namespace Cosmos.Debug.Symbols
-{
-    public class CacheHelper<TKey, TValue>
-        where TKey: IEquatable<TKey>
-    {
-        public CacheHelper(Func<TKey, TValue> getValueFunc)
-        {
-            if (getValueFunc == null)
-            {
-                throw new ArgumentNullException("getValueFunc");
-            }
-            mGetValueFunc = getValueFunc;
-        }
-
-        private readonly Func<TKey, TValue> mGetValueFunc;
-        private TValue mCachedValue;
-        private TKey mCachedKey;
-        private bool mHasCachedValue = false;
-
-        public TValue GetValue(TKey key)
-        {
-            if (mHasCachedValue && mCachedKey.Equals(key))
-            {
-                return mCachedValue;
-            }
-
-            mCachedValue = mGetValueFunc(key);
-            mCachedKey = key;
-            mHasCachedValue = true;
-            return mCachedValue;
-        }
-    }
-}
diff --git a/source/Cosmos.Debug.Symbols/Cosmos.Debug.Symbols.csproj b/source/Cosmos.Debug.Symbols/Cosmos.Debug.Symbols.csproj
deleted file mode 100644
index 1521ac5bf6..0000000000
--- a/source/Cosmos.Debug.Symbols/Cosmos.Debug.Symbols.csproj
+++ /dev/null
@@ -1,30 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <SignAssembly>True</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\Cosmos.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="SQLite.sql" />
-    <EmbeddedResource Include="SQLiteIndexes.sql" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Dapper.StrongName" Version="1.50.2" />
-    <PackageReference Include="DapperExtensions.StrongName" Version="1.50.2" />
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="2.0.0" />
-    <PackageReference Include="Microsoft.DiaSymReader.PortablePdb" Version="1.2.0" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="4.4.0" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.4.0" />
-    <PackageReference Include="System.IO.MemoryMappedFiles" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.Metadata" Version="1.4.2" />
-    <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
-    <PackageReference Include="System.IO.MemoryMappedFiles" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.Metadata" Version="1.5.0" />
-    <PackageReference Include="Microsoft.DiaSymReader" Version="1.1.0" />
-  </ItemGroup>
-
-</Project>
diff --git a/source/Cosmos.Debug.Symbols/DebugInfo.cs b/source/Cosmos.Debug.Symbols/DebugInfo.cs
deleted file mode 100644
index f18afcc8c0..0000000000
--- a/source/Cosmos.Debug.Symbols/DebugInfo.cs
+++ /dev/null
@@ -1,836 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using Microsoft.Data.Sqlite;
-
-using Dapper;
-using DapperExtensions;
-using DapperExtensions.Mapper;
-using DapperExtensions.Sql;
-
-namespace Cosmos.Debug.Symbols
-{
-    using SourceInfos = SortedList<uint, SourceInfo>;
-
-    public class DebugInfo : IDisposable
-    {
-        /// <summary>
-        /// Current id of the generation.
-        /// </summary>
-        private static long mLastGuid = 0;
-
-        /// <summary>
-        /// Range for the id generation process.
-        /// </summary>
-        private static long mPrefix = 0;
-
-        /// <summary>
-        /// Specifies range which is used by the assembler during compilation phase.
-        /// </summary>
-        public const long AssemblerDebugSymbolsRange = 0x0L;
-
-        /// <summary>
-        /// Specifies range which is used by the Elf map extraction process.
-        /// </summary>
-        public const long ElfFileMapExtractionRange = 0x1000000000000000L;
-
-        /// <summary>
-        /// Specifies range which is used by the Nasm map extraction process.
-        /// </summary>
-        public const long NAsmMapExtractionRange = 0x4000000000000000L;
-
-        // Please beware this field, it may cause issues if used incorrectly.
-        public static DebugInfo CurrentInstance { get; private set; }
-
-        public class Field_Map
-        {
-            public string TypeName { get; set; }
-            public List<string> FieldNames = new List<string>();
-        }
-
-        protected SqliteConnection mConnection;
-        protected string mDbName;
-        // Dont use DbConnectionStringBuilder class, it doesnt work with LocalDB properly.
-        //protected mDataSouce = @".\SQLEXPRESS";
-        protected string mConnStr;
-
-        public void DeleteDB(string aDbName, string aPathname)
-        {
-            File.Delete(aDbName);
-        }
-
-        public DebugInfo(string aPathname, bool aCreate = false, bool aCreateIndexes = false)
-        {
-            InitializeCache();
-            CurrentInstance = this;
-
-            if (aPathname != ":memory:")
-            {
-                if (aCreate)
-                {
-                    File.Delete(aPathname);
-                }
-
-                aCreate = !File.Exists(aPathname);
-            }
-
-            // Manually register the data provider. Do not remove this otherwise the data provider doesn't register properly.
-            //mConnStr = string.Format("data source={0};journal mode=Memory;synchronous=Off;foreign keys=True;BinaryGuid=false", aPathname);
-            mConnStr = string.Format("data source={0}", aPathname);
-            // Use the SQLiteConnectionFactory as the default database connection
-            // Do not open mConnection before mEntities.CreateDatabase
-            mConnection = new SqliteConnection(mConnStr);
-
-            DapperExtensions.DapperExtensions.DefaultMapper = typeof(PluralizedAutoClassMapper<>);
-            DapperExtensions.DapperExtensions.SqlDialect = new SqliteDialect();
-
-            if (aCreate)
-            {
-                mConnection.Open();
-                var xSQL = new SQL(mConnection);
-                xSQL.CreateDB();
-
-                // Be careful with indexes, they slow down inserts. So on tables that we have a
-                // lot of inserts, but limited look ups, dont add them.
-                //
-                if (aCreateIndexes)
-                {
-                    this.CreateIndexes();
-                }
-            }
-
-            if (mConnection.State == ConnectionState.Closed)
-            {
-                mConnection.Open();
-            }
-        }
-
-        /// <summary>
-        /// Create indexes inside the database.
-        /// </summary>
-        public void CreateIndexes()
-        {
-            var xSQL = new SQL(mConnection);
-
-            xSQL.MakeIndex("Labels", "Address", false);
-            xSQL.MakeIndex("Labels", "Name", true);
-            xSQL.MakeIndex("Methods", "DocumentID", false);
-
-            xSQL.ExecuteAssemblyResource("SQLiteIndexes.sql");
-        }
-
-        // The GUIDs etc are populated by the MSBuild task, so they wont be loaded when the debugger runs.
-        // Because of this, we also allow manual loading.
-        public void LoadLookups()
-        {
-            foreach (var xDoc in mConnection.GetList<Document>())
-            {
-                DocumentGUIDs.Add(xDoc.Pathname.ToLower(), xDoc.ID);
-            }
-        }
-
-        private void InitializeCache()
-        {
-            mSourceInfosCache = new CacheHelper<uint, SourceInfos>(a => DoGetSourceInfos(a));
-            mLabelsCache = new CacheHelper<uint, string[]>(a => DoGetLabels(a));
-            mFirstMethodIlOpByLabelNameCache = new CacheHelper<string, MethodIlOp>(n => mConnection.GetList<MethodIlOp>(Predicates.Field<MethodIlOp>(q => q.LabelName, Operator.Eq, n)).FirstOrDefault());
-            mMethodCache = new CacheHelper<long, Method>(i => mConnection.Get<Method>(i));
-            mAllLocalsAndArgumentsInfosByMethodLabelNameCache = new CacheHelper<string, LOCAL_ARGUMENT_INFO[]>(a => mConnection.GetList<LOCAL_ARGUMENT_INFO>(Predicates.Field<LOCAL_ARGUMENT_INFO>(q => q.METHODLABELNAME, Operator.Eq, a)).ToArray());
-
-            mDocumentIdByNameCache = new CacheHelper<string, long?>(n =>
-            {
-                long xId;
-                var xHasResult = DocumentGUIDs.TryGetValue(n, out xId);
-                if (xHasResult)
-                {
-                    return xId;
-                }
-                else
-                {
-                    return null;
-                }
-            });
-
-            mAssemblyFileByIdCache = new CacheHelper<long, AssemblyFile>(i => mConnection.Get<AssemblyFile>(i));
-            mAddressOfLabelCache = new CacheHelper<string, uint>(l => DoGetAddressOfLabel(l));
-            mFieldMapCache = new CacheHelper<string, Field_Map>(t => DoGetFieldMap(t));
-            mFieldInfoByNameCache = new CacheHelper<string, FIELD_INFO>(n => mConnection.GetList<FIELD_INFO>(Predicates.Field<FIELD_INFO>(q => q.NAME, Operator.Eq, n)).First());
-        }
-
-        private CacheHelper<uint, SourceInfos> mSourceInfosCache;
-        public SourceInfos GetSourceInfos(uint aAddress)
-        {
-            return mSourceInfosCache.GetValue(aAddress);
-        }
-
-        private CacheHelper<uint, string[]> mLabelsCache;
-        public string[] GetLabels(uint aAddress)
-        {
-            return mLabelsCache.GetValue(aAddress);
-        }
-
-        private CacheHelper<string, MethodIlOp> mFirstMethodIlOpByLabelNameCache;
-        public MethodIlOp TryGetFirstMethodIlOpByLabelName(string aLabelName)
-        {
-            return mFirstMethodIlOpByLabelNameCache.GetValue(aLabelName);
-        }
-
-        private CacheHelper<long, Method> mMethodCache;
-        public Method GetMethod(long aMethodId)
-        {
-            return mMethodCache.GetValue(aMethodId);
-        }
-
-
-        private CacheHelper<string, LOCAL_ARGUMENT_INFO[]> mAllLocalsAndArgumentsInfosByMethodLabelNameCache;
-        public LOCAL_ARGUMENT_INFO[] GetAllLocalsAndArgumentsInfosByMethodLabelName(string aLabelName)
-        {
-            return mAllLocalsAndArgumentsInfosByMethodLabelNameCache.GetValue(aLabelName);
-        }
-
-        private CacheHelper<string, long?> mDocumentIdByNameCache;
-        public bool TryGetDocumentIdByName(string aDocumentName, out long oDocumentId)
-        {
-            var xValue = mDocumentIdByNameCache.GetValue(aDocumentName);
-            oDocumentId = xValue.GetValueOrDefault();
-            return xValue != null;
-        }
-
-        private CacheHelper<long, AssemblyFile> mAssemblyFileByIdCache;
-        public AssemblyFile GetAssemblyFileById(long aId)
-        {
-            return mAssemblyFileByIdCache.GetValue(aId);
-        }
-
-        private CacheHelper<string, uint> mAddressOfLabelCache;
-        public uint GetAddressOfLabel(string aLabelName)
-        {
-            return mAddressOfLabelCache.GetValue(aLabelName);
-        }
-
-        private CacheHelper<string, DebugInfo.Field_Map> mFieldMapCache;
-        public DebugInfo.Field_Map GetFieldMap(string aTypeName)
-        {
-            return mFieldMapCache.GetValue(aTypeName);
-        }
-
-        private CacheHelper<string, FIELD_INFO> mFieldInfoByNameCache;
-        public FIELD_INFO GetFieldInfoByName(string aName)
-        {
-            return mFieldInfoByNameCache.GetValue(aName);
-        }
-
-        private uint DoGetAddressOfLabel(string aLabel)
-        {
-            var xRow = mConnection.GetList<Label>(Predicates.Field<Label>(q => q.Name, Operator.Eq, aLabel)).FirstOrDefault();
-
-            if (xRow == null)
-            {
-                return 0;
-            }
-            return (uint)xRow.Address;
-        }
-
-        private string[] DoGetLabels(uint aAddress)
-        {
-            var xLabels = mConnection.GetList<Label>(Predicates.Field<Label>(q => q.Address, Operator.Eq, aAddress)).Select(i => i.Name).ToArray();
-
-            return xLabels;
-        }
-
-        protected List<string> local_MappingTypeNames = new List<string>();
-        public void WriteFieldMappingToFile(IEnumerable<Field_Map> aMapping)
-        {
-            var xMaps = aMapping.Where(delegate(Field_Map mp)
-            {
-                if (local_MappingTypeNames.Contains(mp.TypeName))
-                {
-                    return false;
-                }
-                else
-                {
-                    local_MappingTypeNames.Add(mp.TypeName);
-                    return true;
-                }
-            });
-
-            // Is a real DB now, but we still store all in RAM. We don't need to. Need to change to query DB as needed instead.
-            var xItemsToAdd = new List<FIELD_MAPPING>(1024);
-            foreach (var xItem in xMaps)
-            {
-                foreach (var xFieldName in xItem.FieldNames)
-                {
-                    var xRow = new FIELD_MAPPING();
-                    xRow.ID = CreateId();
-                    xRow.TYPE_NAME = xItem.TypeName;
-                    xRow.FIELD_NAME = xFieldName;
-                    xItemsToAdd.Add(xRow);
-                }
-            }
-            BulkInsert<FIELD_MAPPING>("FIELD_MAPPINGS", xItemsToAdd);
-        }
-
-        private Field_Map DoGetFieldMap(string aName)
-        {
-            var xMap = new Field_Map();
-            xMap.TypeName = aName;
-
-            var xRows = mConnection.GetList<FIELD_MAPPING>(Predicates.Field<FIELD_MAPPING>(q => q.TYPE_NAME, Operator.Eq, aName));
-
-            foreach (var xFieldName in xRows)
-            {
-                xMap.FieldNames.Add(xFieldName.FIELD_NAME);
-            }
-
-            return xMap;
-        }
-
-        public void ReadFieldMappingList(List<Field_Map> aSymbols)
-        {
-            var xMap = new Field_Map();
-
-            foreach (var xRow in mConnection.GetList<FIELD_MAPPING>())
-            {
-                string xTypeName = xRow.TYPE_NAME;
-
-                if (xTypeName != xMap.TypeName)
-                {
-                    if (xMap.FieldNames.Count > 0)
-                    {
-                        aSymbols.Add(xMap);
-                    }
-
-                    xMap = new Field_Map();
-                    xMap.TypeName = xTypeName;
-                }
-
-                xMap.FieldNames.Add(xRow.FIELD_NAME);
-            }
-
-            aSymbols.Add(xMap);
-        }
-
-        protected List<string> mLocalFieldInfoNames = new List<string>();
-        public void WriteFieldInfoToFile(IList<FIELD_INFO> aFields)
-        {
-            var itemsToAdd = new List<FIELD_INFO>(aFields.Count);
-            foreach (var xItem in aFields)
-            {
-                if (!mLocalFieldInfoNames.Contains(xItem.NAME))
-                {
-                    xItem.ID = CreateId();
-                    mLocalFieldInfoNames.Add(xItem.NAME);
-                    itemsToAdd.Add(xItem);
-                }
-            }
-            BulkInsert<FIELD_INFO>("FIELD_INFOS", itemsToAdd, 2500, true);
-        }
-
-        public class SequencePoint
-        {
-            public int Offset;
-            public string Document;
-            public int LineStart;
-            public int ColStart;
-            public long LineColStart
-            {
-                get { return ((long)LineStart << 32) + ColStart; }
-            }
-            public int LineEnd;
-            public int ColEnd;
-            public long LineColEnd
-            {
-                get { return ((long)LineEnd << 32) + ColEnd; }
-            }
-        }
-
-        // This gets the Sequence Points.
-        // Sequence Points are spots that identify what the compiler/debugger says is a spot
-        // that a breakpoint can occur one. Essentially, an atomic source line in C#
-        public SequencePoint[] GetSequencePoints(MethodBase aMethod, bool aFilterHiddenLines = false)
-        {
-            return GetSequencePoints(aMethod.DeclaringType.GetTypeInfo().Assembly.Location, aMethod.MetadataToken, aFilterHiddenLines);
-        }
-
-        public SequencePoint[] GetSequencePoints(string aAsmPathname, int aMethodToken, bool aFilterHiddenLines = false)
-        {
-            var xSeqPoints = DebugSymbolReader.GetSequencePoints(aAsmPathname, aMethodToken);
-            return xSeqPoints.ToArray();
-        }
-
-        protected List<Method> mMethods = new List<Method>();
-        public void AddMethod(Method aMethod, bool aFlush = false)
-        {
-            if (aMethod != null)
-            {
-                mMethods.Add(aMethod);
-            }
-            BulkInsert("Methods", mMethods, 2500, aFlush);
-        }
-
-        // Quick look up of assemblies so we dont have to go to the database and compare by fullname.
-        // This and other GUID lists contain only a few members, and save us from issuing a lot of selects to SQL.
-        public Dictionary<Assembly, long> AssemblyGUIDs = new Dictionary<Assembly, long>();
-        List<AssemblyFile> xAssemblies = new List<AssemblyFile>();
-
-        public void AddAssemblies(List<Assembly> aAssemblies, bool aFlush = false)
-        {
-            if (aAssemblies != null)
-            {
-
-                foreach (var xAsm in aAssemblies)
-                {
-                    var xRow = new AssemblyFile()
-                    {
-                        ID = CreateId(),
-                        Pathname = xAsm.Location
-                    };
-                    xAssemblies.Add(xRow);
-
-                    AssemblyGUIDs.Add(xAsm, xRow.ID);
-                }
-            }
-            BulkInsert("AssemblyFiles", xAssemblies, 2500, aFlush);
-        }
-
-        public Dictionary<string, long> DocumentGUIDs = new Dictionary<string, long>();
-        List<Document> xDocuments = new List<Document>(1);
-        public void AddDocument(string aPathname, bool aFlush = false)
-        {
-            if (aPathname != null)
-            {
-                aPathname = aPathname.ToLower();
-
-                if (!DocumentGUIDs.ContainsKey(aPathname))
-                {
-                    var xRow = new Document()
-                    {
-                        ID = CreateId(),
-                        Pathname = aPathname
-                    };
-                    DocumentGUIDs.Add(aPathname, xRow.ID);
-                    // Even though we are inserting only one row, Bulk already has a connection
-                    // open so its probably faster than using EF, and its about the same amount of code.
-                    // Need to insert right away so RI will be ok when dependents are inserted.
-                    xDocuments.Add(xRow);
-                    BulkInsert("Documents", xDocuments, 2500, aFlush);
-                }
-            }
-            else
-            {
-                BulkInsert("Documents", xDocuments, 2500, aFlush);
-            }
-        }
-
-        public void AddSymbols(IList<MethodIlOp> aSymbols, bool aFlush = false)
-        {
-            foreach (var x in aSymbols)
-            {
-                x.ID = CreateId();
-            }
-            BulkInsert("MethodIlOps", aSymbols, 2500, aFlush);
-        }
-
-        public void WriteAllLocalsArgumentsInfos(IList<LOCAL_ARGUMENT_INFO> aInfos)
-        {
-            foreach (var x in aInfos)
-            {
-                x.ID = CreateId();
-            }
-            BulkInsert("LOCAL_ARGUMENT_INFOS", aInfos, aFlush: true);
-        }
-
-        // EF is slow on bulk operations. But we want to retain explicit bindings to the model to avoid unbound mistakes.
-        // SqlBulk operations are on average 15x faster. So we use a hybrid approach by using the entities as containers
-        // and EntityDataReader to bridge the gap to SqlBulk.
-        //
-        // We dont want to issue individual inserts to SQL as this is very slow.
-        // But accumulating too many records in RAM also is a problem. For example
-        // at time of writing the full structure would take up 11 MB of RAM just for this structure.
-        // This is not a huge amount, but as we compile in more and more this figure will grow.
-        // So as a compromise, we collect 2500 records then bulk insert.
-        public void BulkInsert<T>(string aTableName, IList<T> aList, int aFlushSize = 0, bool aFlush = false) where T : class
-        {
-            if (aList.Count >= aFlushSize || aFlush)
-            {
-                if (aList.Count > 0)
-                {
-                    using (var xBulkCopy = new SqliteBulkCopy(mConnection))
-                    {
-                        xBulkCopy.DestinationTableName = aTableName;
-#region debug
-                        // for now dump to disk:
-                        //using (var reader = new ObjectReader<T>(aList.ToArray()))
-                        //{
-                        //  var dumpIdx = Interlocked.Increment(ref DataDumpIndex);
-                        //  using (var writer = new StreamWriter(@"e:\Temp\sqls\" + dumpIdx.ToString("D8") + ".dmp"))
-                        //  {
-                        //    writer.WriteLine(typeof(T).FullName);
-                        //    writer.WriteLine("Flush = {0}, flush-size = {1}", aFlush, aFlushSize);
-                        //    bool first = true;
-                        //    while (reader.Read())
-                        //    {
-                        //      if (first)
-                        //      {
-                        //        first = false;
-                        //        for (int i = 0; i < reader.FieldCount; i++)
-                        //        {
-                        //          writer.Write(reader.GetName(i));
-                        //          if (i < (reader.FieldCount - 1))
-                        //          {
-                        //            writer.Write("\t");
-                        //          }
-                        //        }
-                        //        writer.WriteLine();
-                        //      }
-                        //      for (int i = 0; i < reader.FieldCount; i++)
-                        //      {
-                        //        writer.Write(reader.GetValue(i));
-                        //        if (i < (reader.FieldCount - 1))
-                        //        {
-                        //          writer.Write("\t");
-                        //        }
-                        //      }
-                        //      writer.WriteLine();
-                        //    }
-                        //  }
-                        //}
-#endregion region debug
-                        //using (var db = DB())
-                        //{
-                        //    db.Set(typeof(T)).AddRange(aList);
-                        //    db.SaveChanges();
-                        //}
-                        //using (var trans = mConnection.BeginTransaction())
-                        //{
-                        //    try
-                        //    {
-                        //        mConnection.Insert<T>(aList);
-                        //        trans.Commit();
-                        //    }
-                        //    catch(Exception E)
-                        //    {
-                        //        trans.Rollback();
-                        //    }
-                        //}
-                        using (var reader = new ObjectReader<T>(aList))
-                        {
-                            xBulkCopy.WriteToServer(reader);
-                        }
-                    }
-
-                    aList.Clear();
-                }
-            }
-        }
-
-        public void AddLabels(IList<Label> aLabels, bool aFlush = false)
-        {
-            // GUIDs inserted by caller
-            BulkInsert("Labels", aLabels, 2500, aFlush);
-        }
-
-        public void AddINT3Labels(IList<INT3Label> aLabels, bool aFlush = false)
-        {
-            BulkInsert("INT3Labels", aLabels, 2500, aFlush);
-        }
-
-        public void Dispose()
-        {
-            CurrentInstance = null;
-            if (mConnection != null)
-            {
-                AddAssemblies(null, true);
-                AddDocument(null, true);
-                AddMethod(null, true);
-                var xConn = mConnection;
-                xConn.Close();
-                xConn = null;
-                mConnection = null;
-                // Dont set to null... causes problems because of bad code :(
-                // Need to fix the whole class, but its here for now.
-                //CurrentInstance = null;
-            }
-        }
-
-        public Label GetMethodHeaderLabel(uint aAddress)
-        {
-            var xAddress = (long)aAddress;
-            var xLabels = mConnection.GetList<Label>(Predicates.Field<Label>(q => q.Address, Operator.Le, xAddress)).OrderByDescending(i => i.Address).ToArray();
-
-            Label methodHeaderLabel = null;
-
-            //The first label we find searching upwards with "GUID_" at the start will be the very start of the method header
-            foreach (var xLabel in xLabels)
-            {
-                if (xLabel.Name.StartsWith("GUID_"))
-                {
-                    methodHeaderLabel = xLabel;
-                    break;
-                }
-            }
-
-            return methodHeaderLabel;
-        }
-
-        public Label[] GetMethodLabels(uint address)
-        {
-            var xMethod = GetMethod(address);
-            var xFirst = mConnection.Get<Label>(xMethod.LabelStartID);
-            var xLast = mConnection.Get<Label>(xMethod.LabelEndID);
-            var xTemp = mConnection.GetList<Label>(new PredicateGroup()
-                                                   {
-                                                       Operator = GroupOperator.And,
-                                                       Predicates = new List<IPredicate>()
-                                                       {
-                                                           Predicates.Field<Label>(q => q.Address, Operator.Ge, xFirst.Address),
-                                                           Predicates.Field<Label>(q => q.Address, Operator.Le, xLast.Address)
-                                                       }
-                                                   }).ToArray();
-            var xResult = new List<Label>(xTemp.Length);
-
-            //There are always two END__OF__METHOD_EXCEPTION__2 labels at the end of the method footer.
-            int endOfMethodException2LabelsFound = 0;
-
-            foreach (var label in xTemp)
-            {
-                if (label.Name.IndexOf("END__OF__METHOD_EXCEPTION__2", StringComparison.Ordinal) > -1)
-                {
-                    endOfMethodException2LabelsFound++;
-                }
-
-                xResult.Add(label);
-
-                if (endOfMethodException2LabelsFound >= 2)
-                {
-                    break;
-                }
-            }
-
-            return xResult.ToArray();
-        }
-
-        public Method GetMethod(uint aAddress)
-        {
-            var method = mConnection.Query<Method>("select Methods.* from methods " +
-                                                   "inner join Labels LStart on LStart.ID = methods.LabelStartID " +
-                                                   "inner join Labels LEnd on LEnd.ID = Methods.LabelEndID " +
-                                                   "where LStart.Address <= @Address and LEnd.Address > @Address;",
-                                                   new { Address = aAddress }).Single();
-
-            return method;
-        }
-
-        // Gets MLSymbols for a method, given an address within the method.
-        public MethodIlOp[] GetSymbols(Method aMethod)
-        {
-            var xSymbols = mConnection.GetList<MethodIlOp>(Predicates.Field<MethodIlOp>(q => q.MethodID, Operator.Eq, aMethod.ID)).OrderBy(q => q.IlOffset).ToArray();
-
-            return xSymbols;
-        }
-
-        private SourceInfos DoGetSourceInfos(uint aAddress)
-        {
-            var xResult = new SourceInfos();
-
-            try
-            {
-                var xMethod = GetMethod(aAddress);
-
-                if (xMethod != null)
-                {
-                    var xSymbols = GetSymbols(xMethod);
-                    var xAssemblyFile = mConnection.Get<AssemblyFile>(xMethod.AssemblyFileID);
-
-                    var xSeqPoints = GetSequencePoints(xAssemblyFile.Pathname, xMethod.MethodToken).ToList();
-                    int xSeqCount = xSeqPoints.Count;
-
-                    var xCodeOffsets = new int[xSeqCount];
-                    var xCodeDocuments = new string[xSeqCount];
-                    var xCodeStartLines = new int[xSeqCount];
-                    var xCodeStartColumns = new int[xSeqCount];
-                    var xCodeEndLines = new int[xSeqCount];
-                    var xCodeEndColumns = new int[xSeqCount];
-
-                    for (int i = 0; i < xSeqPoints.Count; i++)
-                    {
-                        xCodeOffsets[i] = xSeqPoints[i].Offset;
-                        xCodeDocuments[i] = xSeqPoints[i].Document;
-                        xCodeStartLines[i] = xSeqPoints[i].LineStart;
-                        xCodeStartColumns[i] = xSeqPoints[i].ColStart;
-                        xCodeEndLines[i] = xSeqPoints[i].LineEnd;
-                        xCodeEndColumns[i] = xSeqPoints[i].ColEnd;
-                    }
-
-                    if (xSymbols.Length == 0 && xSeqCount > 0)
-                    {
-                        var xSourceInfo = new SourceInfo()
-                        {
-                            SourceFile = xCodeDocuments[0],
-                            LineStart = xCodeStartLines[0],
-                            LineEnd = xCodeEndLines[0],
-                            ColumnStart = xCodeStartColumns[0],
-                            ColumnEnd = xCodeEndColumns[0],
-                            MethodName = xMethod.LabelCall
-                        };
-
-                        xResult.Add(aAddress, xSourceInfo);
-                    }
-                    else
-                    {
-                        foreach (var xSymbol in xSymbols)
-                        {
-                            var xRow = mConnection.GetList<Label>(Predicates.Field<Label>(q => q.Name, Operator.Eq, xSymbol.LabelName)).FirstOrDefault();
-
-                            if (xRow != null)
-                            {
-                                uint xAddress = (uint) xRow.Address;
-                                // Each address could have mult labels, but this wont matter for SourceInfo, its not tied to label.
-                                // So we just ignore duplicate addresses.
-                                if (!xResult.ContainsKey(xAddress))
-                                {
-                                    int xIdx = SourceInfo.GetIndexClosestSmallerMatch(xCodeOffsets, xSymbol.IlOffset);
-                                    var xSourceInfo = new SourceInfo()
-                                    {
-                                        SourceFile = xCodeDocuments[xIdx],
-                                        LineStart = xCodeStartLines[xIdx],
-                                        LineEnd = xCodeEndLines[xIdx],
-                                        ColumnStart = xCodeStartColumns[xIdx],
-                                        ColumnEnd = xCodeEndColumns[xIdx],
-                                        MethodName = xMethod.LabelCall
-                                    };
-                                    xResult.Add(xAddress, xSourceInfo);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            catch (Exception)
-            {
-            }
-            return xResult;
-        }
-
-        public List<KeyValuePair<uint, string>> GetAllINT3AddressesForMethod(Method aMethod, bool filterPermanentINT3s)
-        {
-            var INT3Labels = mConnection.GetList<INT3Label>(Predicates.Field<INT3Label>(q => q.MethodID, Operator.Eq, aMethod.ID));
-
-            if (filterPermanentINT3s)
-            {
-                INT3Labels = INT3Labels.Where(x => !x.LeaveAsINT3);
-            }
-
-            return INT3Labels.Select(x => new KeyValuePair<uint, string>(GetAddressOfLabel(x.LabelName), x.LabelName)).ToList();
-        }
-
-        public uint GetClosestCSharpBPAddress(uint aAddress)
-        {
-            // Get the method this address belongs to
-            var xMethod = GetMethod(aAddress);
-
-            // Get the assembly file this method belongs to
-            var asm = mConnection.Get<AssemblyFile>(xMethod.AssemblyFileID);
-            // Get the Sequence Points for this method
-            var xSeqPoints = GetSequencePoints(asm.Pathname, xMethod.MethodToken);
-            // Get the IL Offsets for these sequence points
-            var xSeqPointOffsets = xSeqPoints.Select(x => x.Offset);
-
-            // Get all the MethodILOps for this method
-            // Then filter to get only the MethodILOps that also have sequence points
-            // Then get the MethodILOp with the highest address <= to aAddress
-
-            // Get all ILOps for current method
-            // Filter out ones that don't have sequence points associated with them
-            // Order by increasing address (this will happen by order by method ID because of how label names are constructed)
-            var xOps = mConnection.GetList<MethodIlOp>(Predicates.Field<MethodIlOp>(q => q.MethodID, Operator.Eq, xMethod.ID)).Where(delegate (MethodIlOp x)
-            {
-                return xSeqPointOffsets.Contains(x.IlOffset);
-            }).OrderBy(x => x.MethodID);
-
-            //Search for first one with address > aAddress then use the previous
-            uint address = 0;
-
-            foreach (var op in xOps)
-            {
-                uint addr = GetAddressOfLabel(op.LabelName);
-                if (addr > aAddress)
-                {
-                    break;
-                }
-                else
-                {
-                    address = addr;
-                }
-            }
-
-            return address;
-        }
-
-        public MethodIlOp GetFirstMethodIlOpByMethodIdAndILOffset(long aMethodId, long aILOffset)
-        {
-            //Debug("GetFirstMethodIlOpByMethodIdAndILOffset. MethodID = {0}, ILOffset = 0x{1}", aMethodId, aILOffset.ToString("X4"));
-            var xResult = mConnection.GetList<MethodIlOp>(new PredicateGroup
-                                                          {
-                                                              Operator = GroupOperator.And,
-                                                              Predicates = new List<IPredicate>()
-                                                              {
-                                                                  Predicates.Field<MethodIlOp>(q => q.MethodID, Operator.Eq, aMethodId),
-                                                                  Predicates.Field<MethodIlOp>(q => q.IlOffset, Operator.Eq, aILOffset)
-                                                              }
-                                                          }).First();
-            //Debug("Result.LabelName = '{0}'", xResult.LabelName);
-            return xResult;
-        }
-
-        public Method GetMethodByDocumentIDAndLinePosition(long aDocID, long aStartPos, long aEndPos)
-        {
-            //Debug("GetMethodByDocumentIDAndLinePosition. DocID = {0}, StartPos = {1}, EndPos = {2}", aDocID, aStartPos, aEndPos);
-            var xResult = mConnection.GetList<Method>(new PredicateGroup
-                                                      {
-                                                        Operator = GroupOperator.And,
-                                                        Predicates = new List<IPredicate>()
-                                                                     {
-                                                                        Predicates.Field<Method>(q => q.DocumentID, Operator.Eq, aDocID),
-                                                                        Predicates.Field<Method>(q => q.LineColStart, Operator.Le, aStartPos),
-                                                                        Predicates.Field<Method>(q => q.LineColEnd, Operator.Ge, aEndPos)
-                                                                     }
-                                                      }).Single();
-            //Debug("Result.LabelCall = '{0}'", xResult.LabelCall);
-            return xResult;
-        }
-
-        /// <summary>
-        /// Sets the range in which id would be generated.
-        /// </summary>
-        /// <param name="idRange">Number which specified id range.</param>
-        public static void SetRange(long idRange)
-        {
-            mPrefix = idRange;
-            mLastGuid = idRange;
-        }
-
-        /// <summary>
-        /// Gets count of ids generated during last session.
-        /// </summary>
-        /// <returns>Count of generated ids.</returns>
-        public static long GeneratedIdsCount()
-        {
-            return mLastGuid - mPrefix;
-        }
-
-        /// <summary>
-        /// Generates new id for the symbol.
-        /// </summary>
-        /// <returns>New value for the id.</returns>
-        public static long CreateId()
-        {
-            mLastGuid++;
-            return mLastGuid;
-        }
-    }
-
-}
diff --git a/source/Cosmos.Debug.Symbols/DebugModel.cs b/source/Cosmos.Debug.Symbols/DebugModel.cs
deleted file mode 100644
index b76d23b56f..0000000000
--- a/source/Cosmos.Debug.Symbols/DebugModel.cs
+++ /dev/null
@@ -1,459 +0,0 @@
-using System;
-using System.Runtime.Serialization;
-using System.ComponentModel.DataAnnotations;
-
-namespace Cosmos.Debug.Symbols
-{
-    [DataContract(IsReference = true)]
-    public partial class AssemblyFile
-    {
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public long ID
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public string Pathname
-        {
-            get;
-            set;
-        }
-    }
-
-    /// <summary>
-    /// No Metadata Documentation available.
-    /// </summary>
-    [DataContract(IsReference = true)]
-    public partial class Document
-    {
-        [Key]
-        [DataMember()]
-        public long ID
-        {
-            get;
-            set;
-        }
-
-
-        [DataMember()]
-        public string Pathname
-        {
-            get;
-            set;
-        }
-    }
-
-    /// <summary>
-    /// No Metadata Documentation available.
-    /// </summary>
-    [DataContract(IsReference = true)]
-    public partial class FIELD_INFO
-    {
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public string TYPE
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public int OFFSET
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public string NAME
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        [Key]
-        public long ID
-        {
-            get;
-            set;
-        }
-
-    }
-
-    /// <summary>
-    /// No Metadata Documentation available.
-    /// </summary>
-    [DataContract(IsReference = true)]
-    public partial class FIELD_MAPPING
-    {
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public string TYPE_NAME
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public string FIELD_NAME
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [Key]
-        [DataMember()]
-        public long ID
-        {
-            get;
-            set;
-        }
-    }
-
-    /// <summary>
-    /// No Metadata Documentation available.
-    /// </summary>
-    [DataContract(IsReference = true)]
-    public partial class Label
-    {
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public long ID
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public string Name
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public long Address
-        {
-            get;
-            set;
-        }
-    }
-
-    /// <summary>
-    /// No Metadata Documentation available.
-    /// </summary>
-    [DataContract(IsReference = true)]
-    public partial class LOCAL_ARGUMENT_INFO
-    {
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public string METHODLABELNAME
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public bool IsArgument
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public int INDEXINMETHOD
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public int OFFSET
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public string NAME
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public string TYPENAME
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [Key]
-        [DataMember()]
-        public long ID
-        {
-            get;
-            set;
-        }
-    }
-
-    /// <summary>
-    /// No Metadata Documentation available.
-    /// </summary>
-    [DataContract(IsReference = true)]
-    public partial class Method
-    {
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        [Key]
-        public long ID
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public int TypeToken
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public int MethodToken
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public long AssemblyFileID
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public long LineColStart
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public long LineColEnd
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public long DocumentID
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public long? LabelStartID
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public long? LabelEndID
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public string LabelCall
-        {
-            get;
-            set;
-        }
-    }
-
-    /// <summary>
-    /// No Metadata Documentation available.
-    /// </summary>
-    [DataContract(IsReference = true)]
-    public partial class MethodIlOp
-    {
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [Key]
-        [DataMember()]
-        public long ID
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public string LabelName
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public int StackDiff
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public int IlOffset
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public long? MethodID
-        {
-            get;
-            set;
-        }
-    }
-
-    /// <summary>
-    /// No Metadata Documentation available.
-    /// </summary>
-    [DataContract(IsReference = true)]
-    public partial class INT3Label
-    {
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public string LabelName
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public long MethodID
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [DataMember()]
-        public bool LeaveAsINT3
-        {
-            get;
-            set;
-        }
-    }
-}
diff --git a/source/Cosmos.Debug.Symbols/DebugSymbolReader.cs b/source/Cosmos.Debug.Symbols/DebugSymbolReader.cs
deleted file mode 100644
index 5296688f07..0000000000
--- a/source/Cosmos.Debug.Symbols/DebugSymbolReader.cs
+++ /dev/null
@@ -1,322 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Reflection.Metadata;
-using System.Reflection.Metadata.Ecma335;
-using System.Reflection.PortableExecutable;
-using Cosmos.Debug.Symbols.Metadata;
-using Cosmos.Debug.Symbols.Pdb;
-
-namespace Cosmos.Debug.Symbols
-{
-    public class DebugSymbolReader
-    {
-        private static string mCurrentFile;
-        private static DebugSymbolReader mCurrentDebugSymbolReader;
-
-        private readonly PEReader mPEReader;
-        private readonly MetadataReader mMetadataReader;
-        private readonly PdbSymbolReader mSymbolReader;
-        private static readonly Dictionary<string, List<ILLocalVariable>> xLocalVariableInfosCache = new Dictionary<string, List<ILLocalVariable>>();
-
-        private DebugSymbolReader(string aFilePath)
-        {
-            mPEReader = new PEReader(File.OpenRead(aFilePath), PEStreamOptions.PrefetchEntireImage);
-            mSymbolReader = OpenAssociatedSymbolFile(aFilePath, mPEReader);
-            mMetadataReader = mPEReader.GetMetadataReader();
-        }
-
-        internal static DebugSymbolReader GetReader(string aFilePath)
-        {
-            if (File.Exists(aFilePath))
-            {
-                if (mCurrentDebugSymbolReader != null && mCurrentFile == aFilePath)
-                {
-                    return mCurrentDebugSymbolReader;
-                }
-
-                mCurrentDebugSymbolReader = new DebugSymbolReader(aFilePath);
-
-                if (mCurrentDebugSymbolReader.mPEReader.HasMetadata)
-                {
-                    mCurrentFile = aFilePath;
-
-                    return mCurrentDebugSymbolReader;
-                }
-            }
-
-            return null;
-        }
-
-        private PdbSymbolReader OpenAssociatedSymbolFile(string peFilePath, PEReader peReader)
-        {
-            // Assume that the .pdb file is next to the binary
-            var pdbFilename = Path.ChangeExtension(peFilePath, ".pdb");
-            string searchPath = "";
-
-            if (!File.Exists(pdbFilename))
-            {
-                pdbFilename = null;
-
-                // If the file doesn't exist, try the path specified in the CodeView section of the image
-                foreach (DebugDirectoryEntry debugEntry in peReader.ReadDebugDirectory())
-                {
-                    if (debugEntry.Type != DebugDirectoryEntryType.CodeView)
-                    {
-                        continue;
-                    }
-
-                    string candidateFileName = peReader.ReadCodeViewDebugDirectoryData(debugEntry).Path;
-                    if (Path.IsPathRooted(candidateFileName) && File.Exists(candidateFileName))
-                    {
-                        pdbFilename = candidateFileName;
-                        searchPath = Path.GetDirectoryName(pdbFilename);
-                        break;
-                    }
-                }
-
-                if (pdbFilename == null)
-                {
-                    return null;
-                }
-            }
-
-            // Try to open the symbol file as portable pdb first
-            PdbSymbolReader reader = PortablePdbSymbolReader.TryOpen(pdbFilename, MetadataHelper.GetMetadataStringDecoder());
-            if (reader == null)
-            {
-                // Fallback to the diasymreader for non-portable pdbs
-                reader = UnmanagedPdbSymbolReader.TryOpenSymbolReaderForMetadataFile(peFilePath, searchPath);
-            }
-
-            return reader;
-        }
-
-        public static DebugInfo.SequencePoint[] GetSequencePoints(string aAssemblyPath, int aMetadataToken)
-        {
-            var xSequencePoints = new List<DebugInfo.SequencePoint>();
-            try
-            {
-                var xReader = MetadataHelper.TryGetReader(aAssemblyPath);
-                if (xReader == null)
-                {
-                    return xSequencePoints.ToArray();
-                }
-
-                var xMethodDebugInfoHandle = MetadataTokens.MethodDebugInformationHandle(aMetadataToken);
-                if (!xMethodDebugInfoHandle.IsNil)
-                {
-                    var xDebugInfo = xReader.GetMethodDebugInformation(xMethodDebugInfoHandle);
-                    var xDebugInfoSequencePoints = xDebugInfo.GetSequencePoints();
-                    foreach (var xSequencePoint in xDebugInfoSequencePoints)
-                    {
-                        string xDocumentName = string.Empty;
-                        if (!xSequencePoint.Document.IsNil)
-                        {
-                            var xDocument = xReader.GetDocument(xSequencePoint.Document);
-                            if (!xDocument.Name.IsNil)
-                            {
-                                xDocumentName = xReader.GetString(xDocument.Name);
-                            }
-                        }
-
-                        xSequencePoints.Add(new DebugInfo.SequencePoint
-                        {
-                            Document = xDocumentName,
-                            ColStart = xSequencePoint.StartColumn,
-                            ColEnd = xSequencePoint.EndColumn,
-                            LineStart = xSequencePoint.StartLine,
-                            LineEnd = xSequencePoint.EndLine,
-                            Offset = xSequencePoint.Offset
-                        });
-                    }
-
-                }
-            }
-            catch (Exception ex)
-            {
-
-            }
-
-            return xSequencePoints.ToArray();
-        }
-
-        public static MethodBodyBlock GetMethodBodyBlock(Module aModule, int aMetadataToken)
-        {
-            var xMethodDefHandle = MetadataTokens.MethodDefinitionHandle(aMetadataToken);
-            if (!xMethodDefHandle.IsNil)
-            {
-                string xLocation = aModule.Assembly.Location;
-                var xReader = GetReader(xLocation);
-                var xMethodDefinition = xReader.mMetadataReader.GetMethodDefinition(xMethodDefHandle);
-                if (xMethodDefinition.RelativeVirtualAddress > 0)
-                {
-                    int xRelativeVirtualAddress = xMethodDefinition.RelativeVirtualAddress;
-                    return xReader.mPEReader.GetMethodBody(xRelativeVirtualAddress);
-                }
-            }
-            return null;
-        }
-
-        public static List<ILLocalVariable> GetLocalVariableInfos(MethodBase aMethodBase)
-        {
-            string xMenthodId = $"{aMethodBase.MetadataToken}_{aMethodBase.DeclaringType?.FullName}_{aMethodBase.Name}";
-
-            if (xLocalVariableInfosCache.ContainsKey(xMenthodId))
-            {
-                return xLocalVariableInfosCache[xMenthodId];
-            }
-            var xLocalVariables = new List<ILLocalVariable>();
-
-            string xLocation = aMethodBase.Module.Assembly.Location;
-            var xGenericMethodParameters = new Type[0];
-            var xGenericTypeParameters = new Type[0];
-            if (aMethodBase.IsGenericMethod)
-            {
-                xGenericMethodParameters = aMethodBase.GetGenericArguments();
-            }
-            if (aMethodBase.DeclaringType.GetTypeInfo().IsGenericType)
-            {
-                xGenericTypeParameters = aMethodBase.DeclaringType.GetTypeInfo().GetGenericArguments();
-            }
-
-            var xReader = GetReader(xLocation).mMetadataReader;
-            List<ILLocalVariable> xLocalVariablesFromPdb = null;
-            try
-            {
-                xLocalVariablesFromPdb = mCurrentDebugSymbolReader.mSymbolReader.GetLocalVariableNamesForMethod(aMethodBase.MetadataToken).ToList();
-            }
-            catch (Exception)
-            {
-            }
-
-            var xTypes = ResolveLocalsFromSignature(xReader, aMethodBase, xGenericTypeParameters, xGenericMethodParameters).ToList();
-            for (int i = 0; i < xTypes.Count; i++)
-            {
-                int xSlot = i;
-                string xName = "Local" + i;
-                bool xCompilerGenerated = true;
-                ILLocalVariable xLocal = xLocalVariablesFromPdb?.FirstOrDefault(x => x.Slot == i);
-                if (xLocal != null)
-                {
-                    xName = xLocal.Name;
-                    xSlot = xLocal.Slot;
-                    xCompilerGenerated = xLocal.CompilerGenerated;
-                }
-                xLocalVariables.Add(new ILLocalVariable(xSlot, xName, xCompilerGenerated, xTypes[i]));
-            }
-
-            xLocalVariableInfosCache.Add(xMenthodId, xLocalVariables);
-            return xLocalVariables;
-        }
-
-        private static List<Type> ResolveLocalsFromSignature(MetadataReader aReader, MethodBase aMethodBase, Type[] aGenericTypeParameters, Type[] aGenericMethodParameters)
-        {
-            var xLocalVariables = new List<Type>();
-            var xMethodBody = GetMethodBodyBlock(aMethodBase.Module, aMethodBase.MetadataToken);
-            if (xMethodBody != null && !xMethodBody.LocalSignature.IsNil)
-            {
-                var xSig = aReader.GetStandaloneSignature(xMethodBody.LocalSignature);
-                var xLocals = xSig.DecodeLocalSignature(new LocalTypeProvider(aMethodBase.Module), new LocalTypeGenericContext(aGenericTypeParameters.ToImmutableArray(), aGenericMethodParameters.ToImmutableArray()));
-                foreach (var xLocal in xLocals)
-                {
-                    xLocalVariables.Add(xLocal);
-                }
-            }
-            return xLocalVariables;
-        }
-
-        public static Type GetCatchType(Module aModule, ExceptionRegion aRegion)
-        {
-            string xLocation = aModule.Assembly.Location;
-            var xReader = MetadataHelper.TryGetReader(xLocation);
-            switch (aRegion.CatchType.Kind)
-            {
-                case HandleKind.TypeReference:
-                    return MetadataHelper.GetTypeFromReference(xReader, aModule,
-                        (TypeReferenceHandle)aRegion.CatchType, 0);
-                case HandleKind.TypeDefinition:
-                    return aModule.ResolveType(MetadataTokens.GetToken(aRegion.CatchType));
-                case HandleKind.FieldDefinition:
-                    break;
-                case HandleKind.MethodDefinition:
-                    break;
-                case HandleKind.Parameter:
-                    break;
-                case HandleKind.InterfaceImplementation:
-                    break;
-                case HandleKind.MemberReference:
-                    break;
-                case HandleKind.Constant:
-                    break;
-                case HandleKind.CustomAttribute:
-                    break;
-                case HandleKind.DeclarativeSecurityAttribute:
-                    break;
-                case HandleKind.StandaloneSignature:
-                    break;
-                case HandleKind.EventDefinition:
-                    break;
-                case HandleKind.PropertyDefinition:
-                    break;
-                case HandleKind.MethodImplementation:
-                    break;
-                case HandleKind.ModuleReference:
-                    break;
-                case HandleKind.TypeSpecification:
-                    break;
-                case HandleKind.AssemblyDefinition:
-                    break;
-                case HandleKind.AssemblyFile:
-                    break;
-                case HandleKind.AssemblyReference:
-                    break;
-                case HandleKind.ExportedType:
-                    break;
-                case HandleKind.GenericParameter:
-                    break;
-                case HandleKind.MethodSpecification:
-                    break;
-                case HandleKind.GenericParameterConstraint:
-                    break;
-                case HandleKind.MethodDebugInformation:
-                    break;
-                case HandleKind.CustomDebugInformation:
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException();
-            }
-            throw new NotImplementedException();
-        }
-
-        public static bool TryGetStaticFieldValue(Module aModule, int aMetadataToken, ref byte[] aBuffer)
-        {
-            var xAssemblyPath = aModule.Assembly.Location;
-            var xMetadataReader = GetReader(xAssemblyPath).mMetadataReader;
-            var xPEReader = GetReader(xAssemblyPath).mPEReader;
-
-            var xHandle = (FieldDefinitionHandle)MetadataTokens.Handle(aMetadataToken);
-
-            if (!xHandle.IsNil)
-            {
-                var xFieldDefinition = xMetadataReader.GetFieldDefinition(xHandle);
-                var xRVA = xFieldDefinition.GetRelativeVirtualAddress();
-
-                if (xFieldDefinition.Attributes.HasFlag(FieldAttributes.HasFieldRVA))
-                {
-                    var xBytes = xPEReader.GetSectionData(xRVA).GetContent();
-
-                    for (int i = 0; i < aBuffer.Length; i++)
-                    {
-                        aBuffer[i] = xBytes[i];
-                    }
-                }
-            }
-
-            return false;
-        }
-    }
-}
diff --git a/source/Cosmos.Debug.Symbols/Hashing/TypeHashingAlgorithms.cs b/source/Cosmos.Debug.Symbols/Hashing/TypeHashingAlgorithms.cs
deleted file mode 100644
index 3098137013..0000000000
--- a/source/Cosmos.Debug.Symbols/Hashing/TypeHashingAlgorithms.cs
+++ /dev/null
@@ -1,251 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-// ---------------------------------------------------------------------------
-// Generic functions to compute the hashcode value of types
-// ---------------------------------------------------------------------------
-
-using System.Runtime.CompilerServices;
-using System.Text;
-
-namespace Cosmos.Debug.Symbols.Hashing
-{
-    public static class TypeHashingAlgorithms
-    {
-        public struct HashCodeBuilder
-        {
-            private int _hash1;
-            private int _hash2;
-            private int _numCharactersHashed;
-
-            public HashCodeBuilder(string seed)
-            {
-                _hash1 = 0x6DA3B944;
-                _hash2 = 0;
-                _numCharactersHashed = 0;
-
-                Append(seed);
-            }
-
-            public void Append(string src)
-            {
-                if (src.Length == 0)
-                    return;
-
-                int startIndex = 0;
-                if ((_numCharactersHashed & 1) == 1)
-                {
-                    _hash2 = (_hash2 + _rotl(_hash2, 5)) ^ src[0];
-                    startIndex = 1;
-                }
-
-                for (int i = startIndex; i < src.Length; i += 2)
-                {
-                    _hash1 = (_hash1 + _rotl(_hash1, 5)) ^ src[i];
-                    if ((i + 1) < src.Length)
-                        _hash2 = (_hash2 + _rotl(_hash2, 5)) ^ src[i + 1];
-                }
-
-                _numCharactersHashed += src.Length;
-            }
-
-            public int ToHashCode()
-            {
-                int hash1 = _hash1 + _rotl(_hash1, 8);
-                int hash2 = _hash2 + _rotl(_hash2, 8);
-
-                return hash1 ^ hash2;
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static int _rotl(int value, int shift)
-        {
-            return (int)(((uint)value << shift) | ((uint)value >> (32 - shift)));
-        }
-
-        //
-        // Returns the hashcode value of the 'src' string
-        //
-        public static int ComputeNameHashCode(string src)
-        {
-            int hash1 = 0x6DA3B944;
-            int hash2 = 0;
-
-            for (int i = 0; i < src.Length; i += 2)
-            {
-                hash1 = (hash1 + _rotl(hash1, 5)) ^ src[i];
-                if ((i + 1) < src.Length)
-                    hash2 = (hash2 + _rotl(hash2, 5)) ^ src[i + 1];
-            }
-
-            hash1 += _rotl(hash1, 8);
-            hash2 += _rotl(hash2, 8);
-
-            return hash1 ^ hash2;
-        }
-
-        public static unsafe int ComputeASCIINameHashCode(byte* data, int length, out bool isAscii)
-        {
-            int hash1 = 0x6DA3B944;
-            int hash2 = 0;
-            int asciiMask = 0;
-
-            for (int i = 0; i < length; i += 2)
-            {
-                int b1 = data[i];
-                asciiMask |= b1;
-                hash1 = (hash1 + _rotl(hash1, 5)) ^ b1;
-                if ((i + 1) < length)
-                {
-                    int b2 = data[i];
-                    asciiMask |= b2;
-                    hash2 = (hash2 + _rotl(hash2, 5)) ^ b2;
-                }
-            }
-
-            hash1 += _rotl(hash1, 8);
-            hash2 += _rotl(hash2, 8);
-
-            isAscii = (asciiMask & 0x80) == 0;
-
-            return hash1 ^ hash2;
-        }
-
-        // This function may be needed in a portion of the codebase which is too low level to use 
-        // globalization, ergo, we cannot call ToString on the integer.
-        private static string IntToString(int arg)
-        {
-            // This IntToString function is only expected to be used for MDArrayRanks, and therefore is only for positive numbers
-            StringBuilder sb = new StringBuilder(1);
-
-            while (arg != 0)
-            {
-                sb.Append((char)('0' + (arg % 10)));
-                arg = arg / 10;
-            }
-
-            // Reverse the string
-            int sbLen = sb.Length;
-            int pivot = sbLen / 2;
-            for (int i = 0; i < pivot; i++)
-            {
-                int iToSwapWith = sbLen - i - 1;
-                char temp = sb[i];
-                sb[i] = sb[iToSwapWith];
-                sb[iToSwapWith] = temp;
-            }
-
-            return sb.ToString();
-        }
-
-        public static int ComputeArrayTypeHashCode(int elementTypeHashCode, int rank)
-        {
-            // Arrays are treated as generic types in some parts of our system. The array hashcodes are 
-            // carefully crafted to be the same as the hashcodes of their implementation generic types.
-
-            int hashCode;
-            if (rank == -1)
-            {
-                hashCode = unchecked((int)0xd5313557u);
-            }
-            else
-            {
-                hashCode = ComputeNameHashCode("System.MDArrayRank" + IntToString(rank) + "`1");
-            }
-
-            hashCode = (hashCode + _rotl(hashCode, 13)) ^ elementTypeHashCode;
-            return (hashCode + _rotl(hashCode, 15));
-        }
-
-        public static int ComputeArrayTypeHashCode<T>(T elementType, int rank)
-        {
-            return ComputeArrayTypeHashCode(elementType.GetHashCode(), rank);
-        }
-
-
-        public static int ComputePointerTypeHashCode(int pointeeTypeHashCode)
-        {
-            return (pointeeTypeHashCode + _rotl(pointeeTypeHashCode, 5)) ^ 0x12D0;
-        }
-
-        public static int ComputePointerTypeHashCode<T>(T pointeeType)
-        {
-            return ComputePointerTypeHashCode(pointeeType.GetHashCode());
-        }
-
-
-        public static int ComputeByrefTypeHashCode(int parameterTypeHashCode)
-        {
-            return (parameterTypeHashCode + _rotl(parameterTypeHashCode, 7)) ^ 0x4C85;
-        }
-
-        public static int ComputeByrefTypeHashCode<T>(T parameterType)
-        {
-            return ComputeByrefTypeHashCode(parameterType.GetHashCode());
-        }
-
-
-        public static int ComputeNestedTypeHashCode(int enclosingTypeHashCode, int nestedTypeNameHash)
-        {
-            return (enclosingTypeHashCode + _rotl(enclosingTypeHashCode, 11)) ^ nestedTypeNameHash;
-        }
-
-
-        public static int ComputeGenericInstanceHashCode<ARG>(int genericDefinitionHashCode, ARG[] genericTypeArguments)
-        {
-            int hashcode = genericDefinitionHashCode;
-            for (int i = 0; i < genericTypeArguments.Length; i++)
-            {
-                int argumentHashCode = genericTypeArguments[i].GetHashCode();
-                hashcode = (hashcode + _rotl(hashcode, 13)) ^ argumentHashCode;
-            }
-            return (hashcode + _rotl(hashcode, 15));
-        }
-
-        public static int ComputeMethodSignatureHashCode<ARG>(int returnTypeHashCode, ARG[] parameters)
-        {
-            // We're not taking calling conventions into consideration here mostly because there's no
-            // exchange enum type that would define them. We could define one, but the amount of additional
-            // information it would bring (16 or so possibilities) is likely not worth it.
-            int hashcode = returnTypeHashCode;
-            for (int i = 0; i < parameters.Length; i++)
-            {
-                int parameterHashCode = parameters[i].GetHashCode();
-                hashcode = (hashcode + _rotl(hashcode, 13)) ^ parameterHashCode;
-            }
-            return (hashcode + _rotl(hashcode, 15));
-        }
-
-        /// <summary>
-        /// Produce a hashcode for a specific method
-        /// </summary>
-        /// <param name="typeHashCode">HashCode of the type that owns the method</param>
-        /// <param name="nameOrNameAndGenericArgumentsHashCode">HashCode of either the name of the method (for non-generic methods) or the GenericInstanceHashCode of the name+generic arguments of the method.</param>
-        /// <returns></returns>
-        public static int ComputeMethodHashCode(int typeHashCode, int nameOrNameAndGenericArgumentsHashCode)
-        {
-            // TODO! This hash combining function isn't good, but it matches logic used in the past
-            // consider changing to a better combining function once all uses use this function
-            return typeHashCode ^ nameOrNameAndGenericArgumentsHashCode;
-        }
-
-        /// <summary>
-        /// Produce a hashcode for a generic signature variable
-        /// </summary>
-        /// <param name="index">zero based index</param>
-        /// <param name="method">true if the signature variable describes a method</param>
-        public static int ComputeSignatureVariableHashCode(int index, bool method)
-        {
-            if (method)
-            {
-                return index * 0x7822381 + 0x54872645;
-            }
-            else
-            {
-                return index * 0x5498341 + 0x832424;
-            }
-        }
-    }
-}
diff --git a/source/Cosmos.Debug.Symbols/ITokenResolver.cs b/source/Cosmos.Debug.Symbols/ITokenResolver.cs
deleted file mode 100644
index 710f0c01ba..0000000000
--- a/source/Cosmos.Debug.Symbols/ITokenResolver.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Threading.Tasks;
-
-namespace Cosmos.Debug.Symbols
-{
-    // Licensed to the .NET Foundation under one or more agreements.
-    // The .NET Foundation licenses this file to you under the MIT license.
-    // See the LICENSE file in the project root for more information.
-
-    // Code adapted from https://blogs.msdn.microsoft.com/haibo_luo/2010/04/19/ilvisualizer-2010-solution
-
-    public interface ITokenResolver
-    {
-        MethodBase AsMethod(int token);
-        FieldInfo AsField(int token);
-        Type AsType(int token);
-        string AsString(int token);
-        MemberInfo AsMember(int token);
-        byte[] AsSignature(int token);
-    }
-}
diff --git a/source/Cosmos.Debug.Symbols/LocalTypeGenericContext.cs b/source/Cosmos.Debug.Symbols/LocalTypeGenericContext.cs
deleted file mode 100644
index 2a425e55b2..0000000000
--- a/source/Cosmos.Debug.Symbols/LocalTypeGenericContext.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Immutable;
-
-namespace Cosmos.Debug.Symbols
-{
-    public class LocalTypeGenericContext
-    {
-        public LocalTypeGenericContext(ImmutableArray<Type> typeParameters, ImmutableArray<Type> methodParameters)
-        {
-            MethodParameters = methodParameters;
-            TypeParameters = typeParameters;
-        }
-
-        public ImmutableArray<Type> MethodParameters { get; }
-        public ImmutableArray<Type> TypeParameters { get; }
-    }
-}
diff --git a/source/Cosmos.Debug.Symbols/LocalTypeProvider.cs b/source/Cosmos.Debug.Symbols/LocalTypeProvider.cs
deleted file mode 100644
index f4c4c83661..0000000000
--- a/source/Cosmos.Debug.Symbols/LocalTypeProvider.cs
+++ /dev/null
@@ -1,177 +0,0 @@
-using System;
-using System.Collections.Immutable;
-using System.Linq;
-using System.Reflection;
-using System.Reflection.Metadata;
-using System.Reflection.Metadata.Ecma335;
-using Cosmos.Debug.Symbols.Metadata;
-
-namespace Cosmos.Debug.Symbols
-{
-    public class LocalTypeProvider : ISignatureTypeProvider<Type, LocalTypeGenericContext>
-    {
-        private Module mModule;
-
-        public LocalTypeProvider(Module aModule)
-        {
-            mModule = aModule;
-        }
-
-        public Type GetPrimitiveType(PrimitiveTypeCode typeCode)
-        {
-            switch (typeCode)
-            {
-                case PrimitiveTypeCode.Void:
-                    return typeof(void);
-                case PrimitiveTypeCode.Boolean:
-                    return typeof(bool);
-                case PrimitiveTypeCode.Char:
-                    return typeof(char);
-                case PrimitiveTypeCode.SByte:
-                    return typeof(sbyte);
-                case PrimitiveTypeCode.Byte:
-                    return typeof(byte);
-                case PrimitiveTypeCode.Int16:
-                    return typeof(short);
-                case PrimitiveTypeCode.UInt16:
-                    return typeof(ushort);
-                case PrimitiveTypeCode.Int32:
-                    return typeof(int);
-                case PrimitiveTypeCode.UInt32:
-                    return typeof(uint);
-                case PrimitiveTypeCode.Int64:
-                    return typeof(long);
-                case PrimitiveTypeCode.UInt64:
-                    return typeof(ulong);
-                case PrimitiveTypeCode.Single:
-                    return typeof(float);
-                case PrimitiveTypeCode.Double:
-                    return typeof(double);
-                case PrimitiveTypeCode.String:
-                    return typeof(string);
-                case PrimitiveTypeCode.TypedReference:
-                    return typeof(Type);
-                case PrimitiveTypeCode.IntPtr:
-                    return typeof(IntPtr);
-                case PrimitiveTypeCode.UIntPtr:
-                    return typeof(UIntPtr);
-                case PrimitiveTypeCode.Object:
-                    return typeof(object);
-                default:
-                    return null;
-            }
-        }
-
-        public Type GetTypeFromReference(MetadataReader reader, TypeReferenceHandle handle, byte rawTypeKind)
-        {
-            return MetadataHelper.GetTypeFromReference(reader, mModule, handle, rawTypeKind);
-        }
-
-        public Type GetTypeFromDefinition(MetadataReader reader, TypeDefinitionHandle handle, byte rawTypeKind)
-        {
-            TypeDefinition xDefinition = reader.GetTypeDefinition(handle);
-
-            string xName = xDefinition.Namespace.IsNil
-                               ? reader.GetString(xDefinition.Name)
-                               : reader.GetString(xDefinition.Namespace) + "." + reader.GetString(xDefinition.Name);
-
-            if (xDefinition.Attributes.HasFlag(TypeAttributes.NestedPublic | TypeAttributes.NestedPrivate))
-            {
-                TypeDefinitionHandle xDeclaringTypeHandle;
-                TypeDefinition xDeclaringTypeDefinition;
-
-                do
-                {
-                    xDeclaringTypeHandle = xDefinition.GetDeclaringType();
-                    xDeclaringTypeDefinition = reader.GetTypeDefinition(xDeclaringTypeHandle);
-
-                    string xDeclaringTypeName = xDeclaringTypeDefinition.Namespace.IsNil
-                                                ? reader.GetString(xDeclaringTypeDefinition.Name)
-                                                : reader.GetString(xDeclaringTypeDefinition.Namespace) + "." + reader.GetString(xDeclaringTypeDefinition.Name);
-
-                    xName = xDeclaringTypeName + "+" + xName;
-                } while (xDeclaringTypeDefinition.Attributes.HasFlag(TypeAttributes.NestedPublic | TypeAttributes.NestedPrivate));
-            }
-
-            var xType = Type.GetType(xName);
-            if (xType != null)
-            {
-                return xType;
-            }
-
-            try
-            {
-                xType = mModule.ResolveType(MetadataTokens.GetToken(handle), null, null);
-                return xType;
-            }
-            catch
-            {
-                return null;
-            }
-        }
-
-        public Type GetSZArrayType(Type elementType)
-        {
-            return elementType.MakeArrayType();
-        }
-
-        public Type GetGenericInstantiation(Type genericType, ImmutableArray<Type> typeArguments)
-        {
-            return genericType.MakeGenericType(typeArguments.ToArray());
-        }
-
-        public Type GetArrayType(Type elementType, ArrayShape shape)
-        {
-            return elementType.MakeArrayType();
-        }
-
-        public Type GetByReferenceType(Type elementType)
-        {
-            return elementType.MakeByRefType();
-        }
-
-        public Type GetPointerType(Type elementType)
-        {
-            return elementType.MakePointerType();
-        }
-
-        public Type GetFunctionPointerType(MethodSignature<Type> signature)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Type GetPinnedType(Type elementType)
-        {
-            return elementType;
-        }
-
-        public Type GetTypeFromSpecification(MetadataReader reader, LocalTypeGenericContext genericContext, TypeSpecificationHandle handle, byte rawTypeKind)
-        {
-            return reader.GetTypeSpecification(handle).DecodeSignature(this, genericContext);
-        }
-
-        public Type GetModifiedType(Type modifier, Type unmodifiedType, bool isRequired)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Type GetGenericTypeParameter(LocalTypeGenericContext genericContext, int index)
-        {
-            if (index > -1 && genericContext.TypeParameters.Length > index)
-            {
-                return genericContext.TypeParameters[index];
-            }
-            return null;
-        }
-
-        public Type GetGenericMethodParameter(LocalTypeGenericContext genericContext, int index)
-        {
-            if (index > -1 && genericContext.MethodParameters.Length > index)
-            {
-                return genericContext.MethodParameters[index];
-            }
-            return null;
-        }
-    }
-
-}
diff --git a/source/Cosmos.Debug.Symbols/Metadata/CachingMetadataStringDecoder.cs b/source/Cosmos.Debug.Symbols/Metadata/CachingMetadataStringDecoder.cs
deleted file mode 100644
index 9570d99955..0000000000
--- a/source/Cosmos.Debug.Symbols/Metadata/CachingMetadataStringDecoder.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Reflection.Metadata;
-using Cosmos.Debug.Symbols.Hashing;
-
-namespace Cosmos.Debug.Symbols.Metadata
-{
-    /// <summary>
-    /// MetadataReader string decoder that caches and reuses strings rather than allocating
-    /// on each call to MetadataReader.GetString(handle).
-    /// Safe to use from multiple threads and lock free.
-    /// </summary>
-    public sealed class CachingMetadataStringDecoder : MetadataStringDecoder
-    {
-        private struct Entry
-        {
-            // hash code of the entry
-            public int HashCode;
-
-            // full text of the item
-            public string Text;
-        }
-
-        // TODO: Tune the bucket size
-        private const int BucketSize = 4;
-
-        // The table of cached entries. The size of the table has to be power of 2.
-        private Entry[] _table;
-
-        // The next candidate in the bucket range for eviction
-        private int _evictionHint;
-
-        public CachingMetadataStringDecoder(int size)
-            : base(System.Text.Encoding.UTF8)
-        {
-            System.Diagnostics.Debug.Assert((size & (size - 1)) == 0, "The cache size must be power of 2");
-
-            _table = new Entry[size];
-        }
-
-        private string Find(int hashCode, string s)
-        {
-            var arr = _table;
-            int mask = _table.Length - 1;
-
-            int idx = hashCode & mask;
-
-            // we use quadratic probing here
-            // bucket positions are (n^2 + n)/2 relative to the masked hashcode
-            for (int i = 1; i < BucketSize + 1; i++)
-            {
-                string e = arr[idx].Text;
-                int hash = arr[idx].HashCode;
-
-                if (e == null)
-                {
-                    // once we see unfilled entry, the rest of the bucket will be empty
-                    break;
-                }
-
-                if (hash == hashCode && s == e)
-                {
-                    return e;
-                }
-
-                idx = (idx + i) & mask;
-            }
-            return null;
-        }
-
-        private unsafe string FindASCII(int hashCode, byte* bytes, int byteCount)
-        {
-            var arr = _table;
-            int mask = _table.Length - 1;
-
-            int idx = hashCode & mask;
-
-            // we use quadratic probing here
-            // bucket positions are (n^2 + n)/2 relative to the masked hashcode
-            for (int i = 1; i < BucketSize + 1; i++)
-            {
-                string e = arr[idx].Text;
-                int hash = arr[idx].HashCode;
-
-                if (e == null)
-                {
-                    // once we see unfilled entry, the rest of the bucket will be empty
-                    break;
-                }
-
-                if (hash == hashCode && TextEqualsASCII(e, bytes, byteCount))
-                {
-                    return e;
-                }
-
-                idx = (idx + i) & mask;
-            }
-            return null;
-        }
-
-        private static unsafe bool TextEqualsASCII(string text, byte* ascii, int length)
-        {
-#if DEBUG
-            for (var i = 0; i < length; i++)
-            {
-                System.Diagnostics.Debug.Assert((ascii[i] & 0x80) == 0,
-                    "The byte* input to this method must be valid ASCII.");
-            }
-#endif
-
-            if (length != text.Length)
-            {
-                return false;
-            }
-
-            for (var i = 0; i < length; i++)
-            {
-                if (ascii[i] != text[i])
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        private string Add(int hashCode, string s)
-        {
-            var arr = _table;
-            int mask = _table.Length - 1;
-
-            int idx = hashCode & mask;
-
-            // try finding an empty spot in the bucket
-            // we use quadratic probing here
-            // bucket positions are (n^2 + n)/2 relative to the masked hashcode
-            int curIdx = idx;
-            for (int i = 1; i < BucketSize + 1; i++)
-            {
-                if (arr[curIdx].Text == null)
-                {
-                    idx = curIdx;
-                    goto foundIdx;
-                }
-
-                curIdx = (curIdx + i) & BucketSize;
-            }
-
-            // or pick a victim within the bucket range
-            // and replace with new entry
-            var i1 = _evictionHint++ & (BucketSize - 1);
-            idx = (idx + ((i1 * i1 + i1) / 2)) & mask;
-
-            foundIdx:
-            arr[idx].HashCode = hashCode;
-            arr[idx].Text = s;
-
-            return s;
-        }
-
-        public string Lookup(string s)
-        {
-            int hashCode = TypeHashingAlgorithms.ComputeNameHashCode(s);
-
-            string existing = Find(hashCode, s);
-            if (existing != null)
-            {
-                return existing;
-            }
-
-            return Add(hashCode, s);
-        }
-
-        public override unsafe string GetString(byte* bytes, int byteCount)
-        {
-            bool isAscii;
-            int hashCode = TypeHashingAlgorithms.ComputeASCIINameHashCode(bytes, byteCount, out isAscii);
-
-            if (isAscii)
-            {
-                string existing = FindASCII(hashCode, bytes, byteCount);
-                if (existing != null)
-                {
-                    return existing;
-                }
-                return Add(hashCode, Encoding.GetString(bytes, byteCount));
-            }
-            return Lookup(Encoding.GetString(bytes, byteCount));
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/Cosmos.Debug.Symbols/Metadata/MetadataHelper.cs b/source/Cosmos.Debug.Symbols/Metadata/MetadataHelper.cs
deleted file mode 100644
index 8cbbb1efb2..0000000000
--- a/source/Cosmos.Debug.Symbols/Metadata/MetadataHelper.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using System.Reflection.Metadata;
-using System.Reflection.Metadata.Ecma335;
-using System.Reflection.PortableExecutable;
-
-namespace Cosmos.Debug.Symbols.Metadata
-{
-    internal static class MetadataHelper
-    {
-        private static MetadataStringDecoder mMetadataStringDecoder;
-        private static readonly Dictionary<string, MetadataReaderProvider> mMetadataCache;
-
-        static MetadataHelper()
-        {
-            mMetadataCache = new Dictionary<string, MetadataReaderProvider>();
-        }
-
-        public static MetadataReader TryGetReader(string aAssemblyPath)
-        {
-            MetadataReaderProvider provider;
-            if (mMetadataCache.TryGetValue(aAssemblyPath, out provider))
-            {
-                return provider.GetMetadataReader();
-            }
-
-            provider = TryOpenReaderFromAssemblyFile(aAssemblyPath);
-
-            if (provider == null)
-            {
-                return null;
-            }
-
-            mMetadataCache.Add(aAssemblyPath, provider);
-
-            // The reader has already been open, so this doesn't throw:
-            return provider.GetMetadataReader();
-        }
-
-        public static Type GetTypeFromReference(MetadataReader reader, Module aModule, TypeReferenceHandle handle, byte rawTypeKind)
-        {
-            int xToken = MetadataTokens.GetToken(handle);
-            return aModule.ResolveType(xToken, null, null);
-        }
-
-        public static MetadataStringDecoder GetMetadataStringDecoder()
-        {
-            if (mMetadataStringDecoder == null)
-            {
-                mMetadataStringDecoder = new CachingMetadataStringDecoder(0x10000); // TODO: Tune the size
-            }
-            return mMetadataStringDecoder;
-        }
-
-        private static PEReader TryGetPEReader(string aAssemblyPath)
-        {
-            var peStream = TryOpenFile(aAssemblyPath);
-            if (peStream != null)
-            {
-                return new PEReader(peStream);
-            }
-
-            return null;
-        }
-
-        private static MetadataReaderProvider TryOpenReaderFromAssemblyFile(string aAssemblyPath)
-        {
-            using (var peReader = TryGetPEReader(aAssemblyPath))
-            {
-                if (peReader == null)
-                {
-                    return null;
-                }
-
-                string pdbPath;
-                MetadataReaderProvider provider;
-                if (peReader.TryOpenAssociatedPortablePdb(aAssemblyPath, TryOpenFile, out provider, out pdbPath))
-                {
-                    return provider;
-                }
-            }
-
-            return null;
-        }
-
-        private static Stream TryOpenFile(string aPath)
-        {
-            if (!File.Exists(aPath))
-            {
-                return null;
-            }
-
-            try
-            {
-                return File.OpenRead(aPath);
-            }
-            catch
-            {
-                return null;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/Cosmos.Debug.Symbols/ModuleExtensions.cs b/source/Cosmos.Debug.Symbols/ModuleExtensions.cs
deleted file mode 100644
index 3c27193275..0000000000
--- a/source/Cosmos.Debug.Symbols/ModuleExtensions.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Linq;
-using System.Reflection;
-
-namespace Cosmos.Debug.Symbols
-{
-    // Licensed to the .NET Foundation under one or more agreements.
-    // The .NET Foundation licenses this file to you under the MIT license.
-    // See the LICENSE file in the project root for more information.
-
-    // Code adapted from https://blogs.msdn.microsoft.com/haibo_luo/2010/04/19/ilvisualizer-2010-solution
-
-    public static class ModuleExtensions
-    {
-        private static readonly MethodInfo s_resolveMethod = GetMethodInfo(nameof(ResolveMethod));
-        private static readonly MethodInfo s_resolveField = GetMethodInfo(nameof(ResolveField));
-        private static readonly MethodInfo s_resolveType = GetMethodInfo(nameof(ResolveType));
-        private static readonly MethodInfo s_resolveMember = GetMethodInfo(nameof(ResolveMember));
-        private static readonly MethodInfo s_resolveString = GetMethodInfo(nameof(ResolveString));
-        private static readonly MethodInfo s_resolveSignature = GetMethodInfo(nameof(ResolveSignature));
-
-        public static MethodBase ResolveMethod(this Module module, int metadataToken, Type[] genericTypeArguments, Type[] genericMethodArguments) => Invoke<MethodBase>(s_resolveMethod, module, metadataToken, genericTypeArguments, genericMethodArguments);
-        public static FieldInfo ResolveField(this Module module, int metadataToken, Type[] genericTypeArguments, Type[] genericMethodArguments) => Invoke<FieldInfo>(s_resolveField, module, metadataToken, genericTypeArguments, genericMethodArguments);
-        public static Type ResolveType(this Module module, int metadataToken, Type[] genericTypeArguments, Type[] genericMethodArguments) => Invoke<Type>(s_resolveType, module, metadataToken, genericTypeArguments, genericMethodArguments);
-        public static MemberInfo ResolveMember(this Module module, int metadataToken, Type[] genericTypeArguments, Type[] genericMethodArguments) => Invoke<MemberInfo>(s_resolveMember, module, metadataToken, genericTypeArguments, genericMethodArguments);
-        public static byte[] ResolveSignature(this Module module, int metadataToken) => Invoke<byte[]>(s_resolveSignature, module, metadataToken);
-        public static string ResolveString(this Module module, int metadataToken) => Invoke<string>(s_resolveString, module, metadataToken);
-
-        private static MethodInfo GetMethodInfo(string name)
-        {
-            Type[] parameterTypes = typeof(ModuleExtensions).GetMethod(name).GetParameters().Skip(1).Select(p => p.ParameterType).ToArray();
-            return typeof(Module).GetMethod(name, parameterTypes);
-        }
-
-        private static T Invoke<T>(MethodInfo method, Module module, params object[] args) => (T) method.Invoke(module, args);
-    }
-}
diff --git a/source/Cosmos.Debug.Symbols/ModuleScopeTokenResolver.cs b/source/Cosmos.Debug.Symbols/ModuleScopeTokenResolver.cs
deleted file mode 100644
index fb18146743..0000000000
--- a/source/Cosmos.Debug.Symbols/ModuleScopeTokenResolver.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Reflection;
-
-namespace Cosmos.Debug.Symbols
-{
-    // Licensed to the .NET Foundation under one or more agreements.
-    // The .NET Foundation licenses this file to you under the MIT license.
-    // See the LICENSE file in the project root for more information.
-
-    // Code adapted from https://blogs.msdn.microsoft.com/haibo_luo/2010/04/19/ilvisualizer-2010-solution
-
-    public sealed class ModuleScopeTokenResolver : ITokenResolver
-    {
-        private readonly Module _module;
-        private readonly MethodBase _enclosingMethod;
-        private readonly Type[] _methodContext;
-        private readonly Type[] _typeContext;
-
-        public ModuleScopeTokenResolver(MethodBase method)
-        {
-            _enclosingMethod = method;
-            _module = method.Module;
-            _methodContext = (method is ConstructorInfo) ? null : method.GetGenericArguments();
-            _typeContext = (method.DeclaringType == null) ? null : method.DeclaringType.GetGenericArguments();
-        }
-
-        public MethodBase AsMethod(int token) => _module.ResolveMethod(token, _typeContext, _methodContext);
-        public FieldInfo AsField(int token) => _module.ResolveField(token, _typeContext, _methodContext);
-        public Type AsType(int token) => _module.ResolveType(token, _typeContext, _methodContext);
-        public MemberInfo AsMember(int token) => _module.ResolveMember(token, _typeContext, _methodContext);
-        public string AsString(int token) => _module.ResolveString(token);
-        public byte[] AsSignature(int token) => _module.ResolveSignature(token);
-    }
-}
diff --git a/source/Cosmos.Debug.Symbols/ObjectReader.cs b/source/Cosmos.Debug.Symbols/ObjectReader.cs
deleted file mode 100644
index 0bb77194e4..0000000000
--- a/source/Cosmos.Debug.Symbols/ObjectReader.cs
+++ /dev/null
@@ -1,253 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Data;
-using System.Reflection;
-using System.Reflection.Emit;
-
-namespace Cosmos.Debug.Symbols
-{
-    public class ObjectReader<T>: IDataReader
-    {
-        private static readonly ConcurrentDictionary<string, Tuple<string[], Func<object, object>[]>> mInfo = new ConcurrentDictionary<string, Tuple<string[], Func<object, object>[]>>();
-
-        private readonly IEnumerable<T> mItems;
-        private readonly IEnumerator<T> mItemsEnumerator;
-        private int mCurrentIndex = -1;
-
-        // -1 is before first read, -2 is closed
-        public ObjectReader(IEnumerable<T> items)
-        {
-            if (items == null)
-            {
-                throw new ArgumentNullException("items");
-            }
-            mItems = items;
-            mItemsEnumerator = items.GetEnumerator();
-
-            // initialize
-            Tuple<string[], Func<object, object>[]> xInfo;
-            if (mInfo.TryGetValue(typeof(T).FullName, out xInfo))
-            {
-                mFieldGetters = xInfo.Item2;
-                mFieldNames = xInfo.Item1;
-            }
-            else
-            {
-                Console.WriteLine("Detecting fields for type '{0}'", typeof(T).FullName);
-                var props = typeof(T).GetTypeInfo().GetProperties();
-                var xGetters = new List<Func<object, object>>();
-                var xNames = new List<string>();
-                foreach (var prop in props)
-                {
-                    var property = prop;
-                    xNames.Add(prop.Name);
-                    var dynMetho = new DynamicMethod("_" + Guid.NewGuid().ToString("n"), typeof(object), new Type[] { typeof(object) });
-                    var gen = dynMetho.GetILGenerator();
-                    gen.Emit(OpCodes.Ldarg_0);
-                    gen.Emit(OpCodes.Castclass, typeof(T));
-                    gen.Emit(OpCodes.Call, prop.GetGetMethod());
-                    if (prop.PropertyType.GetTypeInfo().IsPrimitive || prop.PropertyType.GetTypeInfo().IsValueType)
-                    {
-                        gen.Emit(OpCodes.Box, prop.PropertyType);
-                    }
-                    gen.Emit(OpCodes.Ret);
-                    xGetters.Add((Func<object, object>)dynMetho.CreateDelegate(typeof(Func<object, object>)));
-                }
-                mFieldNames = xNames.ToArray();
-                mFieldGetters = xGetters.ToArray();
-                mInfo.TryAdd(typeof(T).FullName, Tuple.Create<string[], Func<object, object>[]>(mFieldNames, mFieldGetters));
-            }
-        }
-
-        private static string[] mFieldNames;
-        private static Func<object, object>[] mFieldGetters;
-
-        public void Close()
-        {
-            mCurrentIndex = -2;
-        }
-
-        public int Depth
-        {
-            get { throw new NotImplementedException(); }
-        }
-
-        public DataTable GetSchemaTable()
-        {
-            throw new NotImplementedException();
-        }
-
-        public bool IsClosed
-        {
-            get
-            {
-                return mCurrentIndex == -2;
-            }
-        }
-
-        public bool NextResult()
-        {
-            throw new NotImplementedException();
-        }
-
-        private T mCurrentItem;
-
-        public bool Read()
-        {
-            mCurrentIndex++;
-            var xResult = mItemsEnumerator.MoveNext();
-            if (xResult)
-            {
-                mCurrentItem = mItemsEnumerator.Current;
-            }
-            else
-            {
-                mCurrentItem = default(T);
-            }
-            return xResult;
-        }
-
-        public int RecordsAffected
-        {
-            get
-            {
-                //return mItems.Length;
-                throw new InvalidOperationException();
-            }
-        }
-
-        public void Dispose()
-        {
-            Close();
-        }
-
-        public int FieldCount
-        {
-            get
-            {
-                return mFieldNames.Length;
-            }
-        }
-
-        public bool GetBoolean(int i)
-        {
-            throw new NotImplementedException();
-        }
-
-        public byte GetByte(int i)
-        {
-            throw new NotImplementedException();
-        }
-
-        public long GetBytes(int i, long fieldOffset, byte[] buffer, int bufferoffset, int length)
-        {
-            throw new NotImplementedException();
-        }
-
-        public char GetChar(int i)
-        {
-            throw new NotImplementedException();
-        }
-
-        public long GetChars(int i, long fieldoffset, char[] buffer, int bufferoffset, int length)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IDataReader GetData(int i)
-        {
-            throw new NotImplementedException();
-        }
-
-        public string GetDataTypeName(int i)
-        {
-            throw new NotImplementedException();
-        }
-
-        public DateTime GetDateTime(int i)
-        {
-            throw new NotImplementedException();
-        }
-
-        public decimal GetDecimal(int i)
-        {
-            throw new NotImplementedException();
-        }
-
-        public double GetDouble(int i)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Type GetFieldType(int i)
-        {
-            throw new NotImplementedException();
-        }
-
-        public float GetFloat(int i)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Guid GetGuid(int i)
-        {
-            throw new NotImplementedException();
-        }
-
-        public short GetInt16(int i)
-        {
-            throw new NotImplementedException();
-        }
-
-        public int GetInt32(int i)
-        {
-            throw new NotImplementedException();
-        }
-
-        public long GetInt64(int i)
-        {
-            throw new NotImplementedException();
-        }
-
-        public string GetName(int i)
-        {
-            return mFieldNames[i];
-        }
-
-        public int GetOrdinal(string name)
-        {
-            throw new NotImplementedException();
-        }
-
-        public string GetString(int i)
-        {
-            throw new NotImplementedException();
-        }
-
-        public object GetValue(int i)
-        {
-            return mFieldGetters[i](mCurrentItem);
-        }
-
-        public int GetValues(object[] values)
-        {
-            throw new NotImplementedException();
-        }
-
-        public bool IsDBNull(int i)
-        {
-            throw new NotImplementedException();
-        }
-
-        public object this[string name]
-        {
-            get { throw new NotImplementedException(); }
-        }
-
-        public object this[int i]
-        {
-            get { throw new NotImplementedException(); }
-        }
-    }
-}
diff --git a/source/Cosmos.Debug.Symbols/Pdb/ILLocalVariable.cs b/source/Cosmos.Debug.Symbols/Pdb/ILLocalVariable.cs
deleted file mode 100644
index ebaed28075..0000000000
--- a/source/Cosmos.Debug.Symbols/Pdb/ILLocalVariable.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-
-namespace Cosmos.Debug.Symbols.Pdb
-{
-    /// <summary>
-    /// Represents information about a local variable within a method body.
-    /// </summary>
-    public class ILLocalVariable
-    {
-        public int Slot;
-        public string Name;
-        public bool CompilerGenerated;
-        public Type Type;
-
-        public ILLocalVariable(int aSlot, string aName, bool aCompilerGenerated, Type aType = null)
-        {
-            Slot = aSlot;
-            Name = aName;
-            CompilerGenerated = aCompilerGenerated;
-            Type = aType;
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/source/Cosmos.Debug.Symbols/Pdb/ILSequencePoint.cs b/source/Cosmos.Debug.Symbols/Pdb/ILSequencePoint.cs
deleted file mode 100644
index 2f8663152c..0000000000
--- a/source/Cosmos.Debug.Symbols/Pdb/ILSequencePoint.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Cosmos.Debug.Symbols.Pdb
-{
-    /// <summary>
-    /// Represents a sequence point within an IL method body.
-    /// Sequence point describes a point in the method body at which all side effects of
-    /// previous evaluations have been performed.
-    /// </summary>
-    public struct ILSequencePoint
-    {
-        public readonly int Offset;
-        public readonly string Document;
-        public readonly int LineNumber;
-        // TODO: The remaining info
-
-        public ILSequencePoint(int offset, string document, int lineNumber)
-        {
-            Offset = offset;
-            Document = document;
-            LineNumber = lineNumber;
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/Cosmos.Debug.Symbols/Pdb/PdbSymbolReader.cs b/source/Cosmos.Debug.Symbols/Pdb/PdbSymbolReader.cs
deleted file mode 100644
index 94d3f95ca0..0000000000
--- a/source/Cosmos.Debug.Symbols/Pdb/PdbSymbolReader.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-
-namespace Cosmos.Debug.Symbols.Pdb
-{
-    /// <summary>
-    /// Abstraction for reading Pdb files
-    /// </summary>
-    public abstract class PdbSymbolReader : IDisposable
-    {
-        public abstract IEnumerable<ILSequencePoint> GetSequencePointsForMethod(int methodToken);
-        public abstract IEnumerable<ILLocalVariable> GetLocalVariableNamesForMethod(int methodToken);
-        public abstract void Dispose();
-    }
-}
\ No newline at end of file
diff --git a/source/Cosmos.Debug.Symbols/Pdb/PortablePdbSymbolReader.cs b/source/Cosmos.Debug.Symbols/Pdb/PortablePdbSymbolReader.cs
deleted file mode 100644
index 9bd247abd6..0000000000
--- a/source/Cosmos.Debug.Symbols/Pdb/PortablePdbSymbolReader.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Collections.Generic;
-using System.IO;
-using System.IO.MemoryMappedFiles;
-using System.Reflection.Metadata;
-using System.Reflection.Metadata.Ecma335;
-
-namespace Cosmos.Debug.Symbols.Pdb
-{
-
-    /// <summary>
-    ///  Provides PdbSymbolReader for portable PDB via System.Reflection.Metadata
-    /// </summary>
-    public sealed class PortablePdbSymbolReader : Pdb.PdbSymbolReader
-    {
-        private static unsafe MetadataReader TryOpenMetadataFile(string filePath, MetadataStringDecoder stringDecoder, out MemoryMappedViewAccessor mappedViewAccessor)
-        {
-            FileStream fileStream = null;
-            MemoryMappedFile mappedFile = null;
-            MemoryMappedViewAccessor accessor = null;
-            try
-            {
-                // Create stream because CreateFromFile(string, ...) uses FileShare.None which is too strict
-                fileStream = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read, 4096, false);
-                mappedFile = MemoryMappedFile.CreateFromFile(
-                    fileStream, null, fileStream.Length, MemoryMappedFileAccess.Read, HandleInheritability.None, true);
-
-                accessor = mappedFile.CreateViewAccessor(0, 0, MemoryMappedFileAccess.Read);
-
-                var safeBuffer = accessor.SafeMemoryMappedViewHandle;
-
-                // Check whether this is a real metadata file to avoid thrown and caught exceptions
-                // for non-portable .pdbs
-                if (safeBuffer.Read<byte>(0) != 'B' || // COR20MetadataSignature
-                    safeBuffer.Read<byte>(1) != 'S' ||
-                    safeBuffer.Read<byte>(2) != 'J' ||
-                    safeBuffer.Read<byte>(3) != 'B')
-                {
-                    mappedViewAccessor = null;
-                    return null;
-                }
-
-                var metadataReader = new MetadataReader((byte*)safeBuffer.DangerousGetHandle(), (int)safeBuffer.ByteLength, MetadataReaderOptions.Default, stringDecoder);
-
-                // MemoryMappedFile does not need to be kept around. MemoryMappedViewAccessor is enough.
-
-                mappedViewAccessor = accessor;
-                accessor = null;
-
-                return metadataReader;
-            }
-            finally
-            {
-                accessor?.Dispose();
-                mappedFile?.Dispose();
-                fileStream?.Dispose();
-            }
-        }
-
-        public static PdbSymbolReader TryOpen(string pdbFilename, MetadataStringDecoder stringDecoder)
-        {
-            MemoryMappedViewAccessor mappedViewAccessor;
-            MetadataReader reader = TryOpenMetadataFile(pdbFilename, stringDecoder, out mappedViewAccessor);
-            if (reader == null)
-                return null;
-
-            return new PortablePdbSymbolReader(reader, mappedViewAccessor);
-        }
-
-        private readonly MetadataReader _reader;
-        private readonly MemoryMappedViewAccessor _mappedViewAccessor;
-
-        private PortablePdbSymbolReader(MetadataReader reader, MemoryMappedViewAccessor mappedViewAccessor)
-        {
-            _reader = reader;
-            _mappedViewAccessor = mappedViewAccessor;
-        }
-
-        public override void Dispose()
-        {
-            _mappedViewAccessor.Dispose();
-        }
-
-        public override IEnumerable<ILSequencePoint> GetSequencePointsForMethod(int methodToken)
-        {
-            var debugInformationHandle = ((MethodDefinitionHandle)MetadataTokens.EntityHandle(methodToken)).ToDebugInformationHandle();
-
-            var debugInformation = _reader.GetMethodDebugInformation(debugInformationHandle);
-
-            var sequencePoints = debugInformation.GetSequencePoints();
-
-            foreach (var sequencePoint in sequencePoints)
-            {
-                if (sequencePoint.StartLine == 0xFEEFEE)
-                {
-                    continue;
-                }
-
-                var url = _reader.GetString(_reader.GetDocument(sequencePoint.Document).Name);
-
-                yield return new ILSequencePoint(sequencePoint.Offset, url, sequencePoint.StartLine);
-            }
-        }
-
-        //
-        // Gather the local details in a scope and then recurse to child scopes
-        //
-        private void ProbeScopeForLocals(List<ILLocalVariable> variables, LocalScopeHandle localScopeHandle)
-        {
-            var localScope = _reader.GetLocalScope(localScopeHandle);
-
-            foreach (var localVariableHandle in localScope.GetLocalVariables())
-            {
-                var localVariable = _reader.GetLocalVariable(localVariableHandle);
-
-                var name = _reader.GetString(localVariable.Name);
-                bool compilerGenerated = (localVariable.Attributes & LocalVariableAttributes.DebuggerHidden) != 0;
-
-                variables.Add(new ILLocalVariable(localVariable.Index, name, compilerGenerated));
-            }
-
-            var children = localScope.GetChildren();
-            while (children.MoveNext())
-            {
-                ProbeScopeForLocals(variables, children.Current);
-            }
-        }
-
-        //
-        // Recursively scan the scopes for a method stored in a PDB and gather the local slots
-        // and names for all of them.  This assumes a CSC-like compiler that doesn't re-use
-        // local slots in the same method across scopes.
-        //
-        public override IEnumerable<ILLocalVariable> GetLocalVariableNamesForMethod(int methodToken)
-        {
-            var debugInformationHandle = MetadataTokens.MethodDefinitionHandle(methodToken).ToDebugInformationHandle();
-
-            var localScopes = _reader.GetLocalScopes(debugInformationHandle);
-
-            var variables = new List<ILLocalVariable>();
-            foreach (var localScopeHandle in localScopes)
-            {
-                ProbeScopeForLocals(variables, localScopeHandle);
-            }
-            return variables;
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/Cosmos.Debug.Symbols/Pdb/UnmanagedPdbSymbolReader.cs b/source/Cosmos.Debug.Symbols/Pdb/UnmanagedPdbSymbolReader.cs
deleted file mode 100644
index 1ed57dcaa7..0000000000
--- a/source/Cosmos.Debug.Symbols/Pdb/UnmanagedPdbSymbolReader.cs
+++ /dev/null
@@ -1,274 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using Microsoft.DiaSymReader;
-
-namespace Cosmos.Debug.Symbols.Pdb
-{
-    /// <summary>
-    ///  Provides PdbSymbolReader via unmanaged SymBinder from full .NET Framework
-    /// </summary>
-    public sealed class UnmanagedPdbSymbolReader : Pdb.PdbSymbolReader
-    {
-        [DllImport("mscoree.dll")]
-        private static extern int CLRCreateInstance([In] ref Guid clsid, [In] ref Guid riid, [Out, MarshalAs(UnmanagedType.Interface)] out ICLRMetaHost ppInterface);
-
-        [Guid("d332db9e-b9b3-4125-8207-a14884f53216")]
-        [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-        [ComVisible(true)]
-        interface ICLRMetaHost
-        {
-            [PreserveSig]
-            int GetRuntime([In, MarshalAs(UnmanagedType.LPWStr)] String pwzVersion, [In] ref Guid riid, [Out, MarshalAs(UnmanagedType.Interface)] out ICLRRuntimeInfo ppRuntime);
-
-            // Don't need any other methods.
-        }
-
-        [Guid("bd39d1d2-ba2f-486a-89b0-b4b0cb466891")]
-        [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-        [ComVisible(true)]
-        interface ICLRRuntimeInfo
-        {
-            void GetVersionString_Placeholder();
-            void GetRuntimeDirectory_Placeholder();
-            void IsLoaded_Placeholder();
-            void LoadErrorString_Placeholder();
-            void LoadLibrary_Placeholder();
-            void GetProcAddress_Placeholder();
-
-            [PreserveSig]
-            int GetInterface([In] ref Guid rclsid, [In] ref Guid riid, [Out, MarshalAs(UnmanagedType.IUnknown)] out Object ppUnk);
-
-            void IsLoadable_Placeholder();
-            void SetDefaultStartupFlags_Placeholder();
-            void GetDefaultStartupFlags_Placeholder();
-
-            [PreserveSig]
-            int BindAsLegacyV2Runtime();
-
-            // Don't need any other methods.
-        }
-
-        [Guid("809c652e-7396-11d2-9771-00a0c9b4d50c")]
-        [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-        [ComVisible(true)]
-        private interface IMetaDataDispenser
-        {
-            void DefineScope_Placeholder();
-
-            [PreserveSig]
-            int OpenScope([In, MarshalAs(UnmanagedType.LPWStr)] String szScope, [In] Int32 dwOpenFlags, [In] ref Guid riid, [Out, MarshalAs(UnmanagedType.IUnknown)] out Object punk);
-
-            // Don't need any other methods.
-        }
-
-        [DllImport("ole32.dll")]
-        private static extern int CoCreateInstance(ref Guid rclsid, IntPtr pUnkOuter, Int32 dwClsContext, ref Guid riid, [MarshalAs(UnmanagedType.Interface)] out object ppv);
-
-        private void ThrowExceptionForHR(int hr)
-        {
-            Marshal.ThrowExceptionForHR(hr, new IntPtr(-1));
-        }
-
-        static UnmanagedPdbSymbolReader()
-        {
-            try
-            {
-                Guid IID_IUnknown = new Guid(0x00000000, 0x0000, 0x0000, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46);
-
-                ICLRMetaHost objMetaHost;
-                Guid CLSID_CLRMetaHost = new Guid(0x9280188d, 0x0e8e, 0x4867, 0xb3, 0x0c, 0x7f, 0xa8, 0x38, 0x84, 0xe8, 0xde);
-                Guid IID_CLRMetaHost = new Guid(0xd332db9e, 0xb9b3, 0x4125, 0x82, 0x07, 0xa1, 0x48, 0x84, 0xf5, 0x32, 0x16);
-                if (CLRCreateInstance(ref CLSID_CLRMetaHost, ref IID_CLRMetaHost, out objMetaHost) < 0)
-                    return;
-
-                ICLRRuntimeInfo objRuntime;
-                Guid IID_CLRRuntimeInfo = new Guid(0xbd39d1d2, 0xba2f, 0x486a, 0x89, 0xb0, 0xb4, 0xb0, 0xcb, 0x46, 0x68, 0x91);
-                if (objMetaHost.GetRuntime("v4.0.30319", ref IID_CLRRuntimeInfo, out objRuntime) < 0)
-                    return;
-
-                // To get everything from the v4 runtime
-                objRuntime.BindAsLegacyV2Runtime();
-
-                // Create a COM Metadata dispenser
-                object objDispenser;
-                Guid CLSID_CorMetaDataDispenser = new Guid(0xe5cb7a31, 0x7512, 0x11d2, 0x89, 0xce, 0x00, 0x80, 0xc7, 0x92, 0xe5, 0xd8);
-                if (objRuntime.GetInterface(ref CLSID_CorMetaDataDispenser, ref IID_IUnknown, out objDispenser) < 0)
-                    return;
-                s_metadataDispenser = (IMetaDataDispenser)objDispenser;
-
-                // Create a SymBinder
-                object objBinder;
-                Guid CLSID_CorSymBinder = new Guid(0x0a29ff9e, 0x7f9c, 0x4437, 0x8b, 0x11, 0xf4, 0x24, 0x49, 0x1e, 0x39, 0x31);
-                if (CoCreateInstance(ref CLSID_CorSymBinder,
-                        IntPtr.Zero, // pUnkOuter
-                        1, // CLSCTX_INPROC_SERVER
-                        ref IID_IUnknown,
-                        out objBinder) < 0)
-                    return;
-                s_symBinder = (ISymUnmanagedBinder)objBinder;
-            }
-            catch
-            {
-            }
-        }
-
-        private static IMetaDataDispenser s_metadataDispenser;
-        private static ISymUnmanagedBinder s_symBinder;
-
-        public static PdbSymbolReader TryOpenSymbolReaderForMetadataFile(string metadataFileName, string searchPath)
-        {
-            try
-            {
-                if (s_metadataDispenser == null || s_symBinder == null)
-                    return null;
-
-                Guid IID_IMetaDataImport = new Guid(0x7dac8207, 0xd3ae, 0x4c75, 0x9b, 0x67, 0x92, 0x80, 0x1a, 0x49, 0x7d, 0x44);
-
-                // Open an metadata importer on the given filename. We'll end up passing this importer straight
-                // through to the Binder.
-                object objImporter;
-                if (s_metadataDispenser.OpenScope(metadataFileName, 0x00000010 /* read only */, ref IID_IMetaDataImport, out objImporter) < 0)
-                    return null;
-
-                ISymUnmanagedReader reader;
-                if (s_symBinder.GetReaderForFile(objImporter, metadataFileName, searchPath, out reader) < 0)
-                    return null;
-
-                return new UnmanagedPdbSymbolReader(reader);
-            }
-            catch
-            {
-                return null;
-            }
-        }
-
-        private ISymUnmanagedReader _symUnmanagedReader;
-
-        private UnmanagedPdbSymbolReader(ISymUnmanagedReader symUnmanagedReader)
-        {
-            _symUnmanagedReader = symUnmanagedReader;
-        }
-
-        public override void Dispose()
-        {
-            Marshal.ReleaseComObject(_symUnmanagedReader);
-        }
-
-        private Dictionary<ISymUnmanagedDocument, string> _urlCache;
-
-        private string GetUrl(ISymUnmanagedDocument doc)
-        {
-            lock (this)
-            {
-                if (_urlCache == null)
-                    _urlCache = new Dictionary<ISymUnmanagedDocument, string>();
-
-                string url;
-                if (_urlCache.TryGetValue(doc, out url))
-                    return url;
-
-                int urlLength;
-                ThrowExceptionForHR(doc.GetUrl(0, out urlLength, null));
-
-                // urlLength includes terminating '\0'
-                char[] urlBuffer = new char[urlLength];
-                ThrowExceptionForHR(doc.GetUrl(urlLength, out urlLength, urlBuffer));
-
-                url = new string(urlBuffer, 0, urlLength - 1);
-                _urlCache.Add(doc, url);
-                return url;
-            }
-        }
-
-        public override IEnumerable<ILSequencePoint> GetSequencePointsForMethod(int methodToken)
-        {
-            ISymUnmanagedMethod symbolMethod;
-            if (_symUnmanagedReader.GetMethod(methodToken, out symbolMethod) < 0)
-                yield break;
-
-            int count;
-            ThrowExceptionForHR(symbolMethod.GetSequencePointCount(out count));
-
-            ISymUnmanagedDocument[] docs = new ISymUnmanagedDocument[count];
-            int[] lineNumbers = new int[count];
-            int[] ilOffsets = new int[count];
-
-            ThrowExceptionForHR(symbolMethod.GetSequencePoints(count, out count, ilOffsets, docs, lineNumbers, null, null, null));
-
-            for (int i = 0; i < count; i++)
-            {
-                if (lineNumbers[i] == 0xFEEFEE)
-                    continue;
-
-                yield return new ILSequencePoint(ilOffsets[i], GetUrl(docs[i]), lineNumbers[i]);
-            }
-        }
-
-        //
-        // Gather the local details in a scope and then recurse to child scopes
-        //
-        private void ProbeScopeForLocals(List<ILLocalVariable> variables, ISymUnmanagedScope scope)
-        {
-            int localCount;
-            ThrowExceptionForHR(scope.GetLocalCount(out localCount));
-
-            ISymUnmanagedVariable[] locals = new ISymUnmanagedVariable[localCount];
-            ThrowExceptionForHR(scope.GetLocals(localCount, out localCount, locals));
-
-            for (int i = 0; i < localCount; i++)
-            {
-                var local = locals[i];
-
-                int slot;
-                ThrowExceptionForHR(local.GetAddressField1(out slot));
-
-                int nameLength;
-                ThrowExceptionForHR(local.GetName(0, out nameLength, null));
-
-                // nameLength includes terminating '\0'
-                char[] nameBuffer = new char[nameLength];
-                ThrowExceptionForHR(local.GetName(nameLength, out nameLength, nameBuffer));
-
-                int attributes;
-                ThrowExceptionForHR(local.GetAttributes(out attributes));
-
-                variables.Add(new ILLocalVariable(slot, new String(nameBuffer, 0, nameLength - 1), (attributes & 0x1) != 0));
-            }
-
-            int childrenCount;
-            ThrowExceptionForHR(scope.GetChildren(0, out childrenCount, null));
-
-            ISymUnmanagedScope[] children = new ISymUnmanagedScope[childrenCount];
-            ThrowExceptionForHR(scope.GetChildren(childrenCount, out childrenCount, children));
-
-            for (int i = 0; i < childrenCount; i++)
-            {
-                ProbeScopeForLocals(variables, children[i]);
-            }
-        }
-
-        //
-        // Recursively scan the scopes for a method stored in a PDB and gather the local slots
-        // and names for all of them.  This assumes a CSC-like compiler that doesn't re-use
-        // local slots in the same method across scopes.
-        //
-        public override IEnumerable<ILLocalVariable> GetLocalVariableNamesForMethod(int methodToken)
-        {
-            ISymUnmanagedMethod symbolMethod;
-            if (_symUnmanagedReader.GetMethod(methodToken, out symbolMethod) < 0)
-                return null;
-
-            ISymUnmanagedScope rootScope;
-            ThrowExceptionForHR(symbolMethod.GetRootScope(out rootScope));
-
-            var variables = new List<ILLocalVariable>();
-            ProbeScopeForLocals(variables, rootScope);
-            return variables;
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/Cosmos.Debug.Symbols/SQL.cs b/source/Cosmos.Debug.Symbols/SQL.cs
deleted file mode 100644
index 80d20905c6..0000000000
--- a/source/Cosmos.Debug.Symbols/SQL.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using System;
-using System.IO;
-using System.Reflection;
-using Microsoft.Data.Sqlite;
-
-namespace Cosmos.Debug.Symbols
-{
-    public class SQL
-    {
-        public readonly SqliteConnection Connection;
-
-        public SQL(SqliteConnection aConnection)
-        {
-            Connection = aConnection;
-        }
-
-        public int? SelectOneInt(string aSql)
-        {
-            var xQry = Connection.CreateCommand();
-            xQry.CommandText = aSql;
-            return (int)xQry.ExecuteScalar();
-        }
-
-        public void Exec(string aSql)
-        {
-            var xQry = Connection.CreateCommand();
-            xQry.CommandText = aSql;
-            xQry.ExecuteNonQuery();
-        }
-
-        public void MakeUniqueInt(string aTable, string aCol, bool aAllowNulls)
-        {
-            string xIdxName = "Uq_" + aTable + "_" + aCol;
-            if (aAllowNulls)
-            {
-                //http://sqlservercodebook.blogspot.com/2008/04/multiple-null-values-in-unique-index-in.html
-                Exec("ALTER TABLE " + aTable + " ADD " + xIdxName + " AS (CASE WHEN " + aCol + " IS NULL THEN Id * -1 ELSE " + aCol + " END);");
-                // We create index seperately instead of using unique keyword on previous SQL
-                // so we can control name of the index for better identification
-                Exec("CREATE UNIQUE INDEX Idx" + xIdxName + " ON " + aTable + "(" + xIdxName + ");");
-            }
-            else
-            {
-                Exec("CREATE UNIQUE INDEX Idx" + xIdxName + " ON " + aTable + "(" + aCol + ");");
-            }
-        }
-
-        public void MakeIndex(string aTable, string aCol, bool aUnique)
-        {
-            Exec("CREATE " + (aUnique ? "UNIQUE " : "") + "INDEX Idx_" + aTable + "_" + aCol + " ON " + aTable + "(" + aCol + ");");
-        }
-
-        public void MakeUniqueString(string aTable, string aCol, bool aAllowNulls)
-        {
-            string xIdxName = "Uq_" + aTable + "_" + aCol;
-            if (aAllowNulls)
-            {
-                Exec("ALTER TABLE " + aTable + " ADD " + xIdxName + " AS (CASE WHEN " + aCol + " IS NULL THEN 'key-' + CAST([Id] as varchar(10)) ELSE UPPER(RTRIM(LTRIM(" + aCol + "))) END);");
-                Exec("CREATE UNIQUE INDEX Idx" + xIdxName + " ON " + aTable + "(" + xIdxName + ");");
-            }
-            else
-            {
-                Exec("CREATE UNIQUE INDEX Idx" + xIdxName + " ON " + aTable + "(" + aCol + ");");
-            }
-        }
-
-        internal void CreateDB()
-        {
-            ExecuteAssemblyResource("SQLite.sql");
-        }
-
-        /// <summary>
-        /// Exceutes SQL file stored inside assembly.
-        /// </summary>
-        /// <param name="resourceName">Name of the assembly resource to execute.</param>
-        internal void ExecuteAssemblyResource(string resourceName)
-        {
-            resourceName = GetType().GetTypeInfo().Assembly.GetName().Name + "." + resourceName;
-
-            using (var strm = typeof(SQL).GetTypeInfo().Assembly.GetManifestResourceStream(resourceName))
-            {
-                if (strm == null)
-                {
-                    throw new Exception("Sql resource not found!");
-                }
-                using (var reader = new StreamReader(strm))
-                {
-                    Exec(reader.ReadToEnd());
-                }
-            }
-        }
-    }
-}
diff --git a/source/Cosmos.Debug.Symbols/SQLite.sql b/source/Cosmos.Debug.Symbols/SQLite.sql
deleted file mode 100644
index 73724f8179..0000000000
--- a/source/Cosmos.Debug.Symbols/SQLite.sql
+++ /dev/null
@@ -1,93 +0,0 @@
--- --------------------------------------------------
--- Creating all tables
--- --------------------------------------------------
-
--- Creating table 'FIELD_INFO'
-CREATE TABLE [FIELD_INFOS] (
-    [TYPE] nvarchar(512)  NOT NULL,
-    [OFFSET] int  NOT NULL,
-    [NAME] nvarchar(512)  NOT NULL,
-    [ID] integer primary key
-);
-
-
--- Creating table 'FIELD_MAPPING'
-CREATE TABLE [FIELD_MAPPINGS] (
-    [TYPE_NAME] nvarchar(512)  NOT NULL,
-    [FIELD_NAME] nvarchar(512)  NOT NULL,
-    [ID] integer  primary key
-);
-
-
--- Creating table 'Labels'
-CREATE TABLE [Labels] (
-    [ID] integer  NOT NULL primary key,
-    [Name] nvarchar(256)  NOT NULL,
-    [Address] integer not null
-);
-
-
--- Creating table 'LOCAL_ARGUMENT_INFO'
-CREATE TABLE [LOCAL_ARGUMENT_INFOS] (
-    [METHODLABELNAME] nvarchar(256)  NOT NULL,
-    [IsArgument] bit  NOT NULL,
-    [INDEXINMETHOD] int  NOT NULL,
-    [OFFSET] int  NOT NULL,
-    [NAME] nvarchar(64)  NOT NULL,
-    [TYPENAME] nvarchar(256)  NOT NULL,
-    [ID] integer primary key
-);
-
-
--- Creating table 'MethodIlOps'
-CREATE TABLE [MethodIlOps] (
-    [ID] integer primary key,
-    [LabelName] nvarchar(256)  NOT NULL,
-    [StackDiff] int  NOT NULL,
-    [IlOffset] int  NOT NULL
-);
-
-
--- Creating table 'AssemblyFiles'
-CREATE TABLE [AssemblyFiles] (
-    [ID] integer primary key,
-    [Pathname] nvarchar(256)  NOT NULL
-);
-
-
--- Creating table 'Methods'
-CREATE TABLE [Methods] (
-    [ID] integer primary key,
-    [TypeToken] int  NOT NULL,
-    [MethodToken] int  NOT NULL,
-    [LineColStart] int  NOT NULL,
-    [LineColEnd] int  NOT NULL,
-    [LabelCall] nvarchar(256)  NOT NULL
-);
-
-
--- Creating table 'Documents'
-CREATE TABLE [Documents] (
-    [ID] integer primary key,
-    [Pathname] nvarchar(256)  NOT NULL
-);
-
--- Creating table 'INT3Labels'
-CREATE TABLE [INT3Labels] (
-	[LabelName] nvarchar(256) NOT NULL,
-	[MethodID] integer NOT NULL,
-	[LeaveAsINT3] bit NOT NULL
-);
-
-alter table methods
-  add column AssemblyFileID integer null;-- references AssemblyFiles(ID);
-alter table methods
-  add column DocumentID integer null;-- references Documents(ID);
-alter table methods
-  add column LabelStartID integer null;-- references Labels(ID);
-alter table methods
-  add column LabelEndID integer null;-- references Labels(ID);
-
-alter table MethodIlOps
-  add column MethodID integer null;-- references Methods(ID);
-
diff --git a/source/Cosmos.Debug.Symbols/SQLiteIndexes.sql b/source/Cosmos.Debug.Symbols/SQLiteIndexes.sql
deleted file mode 100644
index cc7b1d5812..0000000000
--- a/source/Cosmos.Debug.Symbols/SQLiteIndexes.sql
+++ /dev/null
@@ -1,26 +0,0 @@
--- Creating non-clustered index for FOREIGN KEY 'FK_AssemblyFileMethod'
-CREATE INDEX [IX_FK_AssemblyFileMethod]
-ON [Methods]
-    ([AssemblyFileID]);    
-
-
--- Creating non-clustered index for FOREIGN KEY 'FK_DocumentMethod'
-CREATE INDEX [IX_FK_DocumentMethod]
-ON [Methods]
-    ([DocumentID]);
-
--- Creating non-clustered index for FOREIGN KEY 'FK_LabelMethod'
-CREATE INDEX [IX_FK_LabelMethod]
-ON [Methods]
-    ([LabelStartID]);
-
--- Creating non-clustered index for FOREIGN KEY 'FK_LabelMethodEnd'
-CREATE INDEX [IX_FK_LabelMethodEnd]
-ON [Methods]
-    ([LabelEndID]);
-
-
--- Creating non-clustered index for FOREIGN KEY 'FK_MethodIlOpMethod'
-CREATE INDEX [IX_FK_MethodIlOpMethod]
-ON [MethodIlOps]
-    ([MethodID]);
diff --git a/source/Cosmos.Debug.Symbols/SourceInfo.cs b/source/Cosmos.Debug.Symbols/SourceInfo.cs
deleted file mode 100644
index 9a5d081425..0000000000
--- a/source/Cosmos.Debug.Symbols/SourceInfo.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Collections.Generic;
-
-namespace Cosmos.Debug.Symbols {
-  //public class SourceInfos : SortedList<uint, SourceInfo> {
-  //}
-
-  public class SourceInfo {
-    public string MethodName { get; set; }
-    public string SourceFile { get; set; }
-    public int LineStart { get; set; }
-    public int ColumnStart { get; set; }
-    public int LineEnd { get; set; }
-    public int ColumnEnd { get; set; }
-
-    public static int GetIndexClosestSmallerMatch(IList<int> aList, int aValue) {
-      int xIdx = -1;
-      for (int i = 0; i < aList.Count; i++) {
-        if (aList[i] <= aValue) {
-          xIdx = i;
-        } else {
-          break;
-        }
-      }
-      return xIdx;
-    }
-  }
-}
diff --git a/source/Cosmos.Debug.Symbols/SqliteBulkCopy.cs b/source/Cosmos.Debug.Symbols/SqliteBulkCopy.cs
deleted file mode 100644
index a16c60ab91..0000000000
--- a/source/Cosmos.Debug.Symbols/SqliteBulkCopy.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using Microsoft.Data.Sqlite;
-using System;
-using System.Data;
-
-namespace Cosmos.Debug.Symbols
-{
-    public class SqliteBulkCopy : IDisposable
-    {
-        private bool mDisposed = false;
-
-        public void Dispose()
-        {
-            if (mDisposed)
-            {
-                return;
-            }
-            mDisposed = true;
-            GC.SuppressFinalize(this);
-        }
-
-        private readonly SqliteConnection mConnection;
-
-        public SqliteBulkCopy(SqliteConnection connection)
-        {
-            mConnection = connection;
-        }
-
-        public string DestinationTableName { get; set; }
-
-        public void WriteToServer(IDataReader reader)
-        {
-            if (reader.Read())
-            {
-                // initialize bulk copy
-
-                using (var trans = mConnection.BeginTransaction())
-                {
-                    using (var command = mConnection.CreateCommand())
-                    {
-                        var fieldNames = "";
-                        var paramNames = "";
-                        SqliteParameter[] parms = new SqliteParameter[reader.FieldCount];
-                        for (int i = 0; i < reader.FieldCount; i++)
-                        {
-                            string xFieldName = reader.GetName(i);
-                            fieldNames += $"{xFieldName},";
-                            paramNames += $"@_{xFieldName},";
-                            parms[i] = new SqliteParameter($"@_{xFieldName}", SqliteType.Text);
-                            command.Parameters.Add(parms[i]);
-                        }
-                        fieldNames = fieldNames.TrimEnd(',');
-                        paramNames = paramNames.TrimEnd(',');
-
-                        command.Transaction = trans;
-                        command.CommandText = $"insert into [{DestinationTableName}] ({fieldNames}) values ({paramNames})";
-                        command.Prepare();
-                        do
-                        {
-                            for (int i = 0; i < reader.FieldCount; i++)
-                            {
-                                if (parms[i] != null)
-                                {
-                                    parms[i].Value = reader.GetValue(i);
-                                }
-                            }
-                            command.ExecuteNonQuery();
-                        }
-                        while (reader.Read());
-                    }
-                    trans.Commit();
-                }
-            }
-        }
-    }
-}
diff --git a/source/Cosmos.VS.DebugEngine/Cosmos.VS.DebugEngine.csproj b/source/Cosmos.VS.DebugEngine/Cosmos.VS.DebugEngine.csproj
index 563cc1244a..cde3f451c5 100644
--- a/source/Cosmos.VS.DebugEngine/Cosmos.VS.DebugEngine.csproj
+++ b/source/Cosmos.VS.DebugEngine/Cosmos.VS.DebugEngine.csproj
@@ -283,7 +283,7 @@
       <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
       <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
     </ProjectReference>
-    <ProjectReference Include="..\Cosmos.Debug.Symbols\Cosmos.Debug.Symbols.csproj">
+    <ProjectReference Include="..\..\..\IL2CPU\source\Cosmos.Debug.Symbols\Cosmos.Debug.Symbols.csproj">
       <Project>{ecc4319f-a844-45b8-bf63-2fd04f05e56a}</Project>
       <Name>Cosmos.Debug.Symbols</Name>
       <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
diff --git a/source/Cosmos.VS.ProjectSystem/ProfilePresets.cs b/source/Cosmos.VS.ProjectSystem/ProfilePresets.cs
index a56c6c1f36..db64928569 100644
--- a/source/Cosmos.VS.ProjectSystem/ProfilePresets.cs
+++ b/source/Cosmos.VS.ProjectSystem/ProfilePresets.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Reflection;
-using Cosmos.Debug.Common;
+using Cosmos.Build.Common;
 
 namespace Cosmos.VS.ProjectSystem
 {
@@ -22,4 +22,4 @@ public ProfilePresets()
             Add("HyperV", "Hyper-V");
         }
     }
-}
\ No newline at end of file
+}