diff --git a/PowerForensics/Module/PowerForensics/PowerForensics.dll b/PowerForensics/Module/PowerForensics/PowerForensics.dll
index b481a57..ffe4435 100644
Binary files a/PowerForensics/Module/PowerForensics/PowerForensics.dll and b/PowerForensics/Module/PowerForensics/PowerForensics.dll differ
diff --git a/PowerForensics/Module/PowerForensics/PowerForensics.psd1 b/PowerForensics/Module/PowerForensics/PowerForensics.psd1
index bd3d685..7f9d5c2 100644
Binary files a/PowerForensics/Module/PowerForensics/PowerForensics.psd1 and b/PowerForensics/Module/PowerForensics/PowerForensics.psd1 differ
diff --git a/PowerForensics/Module/PowerForensicsv2/PowerForensicsv2_Types.ps1xml b/PowerForensics/Module/PowerForensicsv2/PowerForensics_Types.ps1xml
similarity index 100%
rename from PowerForensics/Module/PowerForensicsv2/PowerForensicsv2_Types.ps1xml
rename to PowerForensics/Module/PowerForensicsv2/PowerForensics_Types.ps1xml
diff --git a/PowerForensics/Module/PowerForensicsv2/PowerForensicsv2.dll b/PowerForensics/Module/PowerForensicsv2/PowerForensicsv2.dll
index 56cd8d2..9aed6c4 100644
Binary files a/PowerForensics/Module/PowerForensicsv2/PowerForensicsv2.dll and b/PowerForensics/Module/PowerForensicsv2/PowerForensicsv2.dll differ
diff --git a/PowerForensics/Module/PowerForensicsv2/PowerForensicsv2.psd1 b/PowerForensics/Module/PowerForensicsv2/PowerForensicsv2.psd1
index 254929e..718402e 100644
Binary files a/PowerForensics/Module/PowerForensicsv2/PowerForensicsv2.psd1 and b/PowerForensics/Module/PowerForensicsv2/PowerForensicsv2.psd1 differ
diff --git a/PowerForensics/Module/PowerForensicsv2/System.Management.Automation.dll b/PowerForensics/Module/PowerForensicsv2/System.Management.Automation.dll
new file mode 100644
index 0000000..e1ec533
Binary files /dev/null and b/PowerForensics/Module/PowerForensicsv2/System.Management.Automation.dll differ
diff --git a/PowerForensics/Module/PowerForensicsv2/mscorlib.dll b/PowerForensics/Module/PowerForensicsv2/mscorlib.dll
deleted file mode 100644
index 0ee0c86..0000000
Binary files a/PowerForensics/Module/PowerForensicsv2/mscorlib.dll and /dev/null differ
diff --git a/PowerForensics/Module/PowerForensicsv2/normidna.nlp b/PowerForensics/Module/PowerForensicsv2/normidna.nlp
deleted file mode 100644
index 5a69df1..0000000
Binary files a/PowerForensics/Module/PowerForensicsv2/normidna.nlp and /dev/null differ
diff --git a/PowerForensics/Module/PowerForensicsv2/normnfc.nlp b/PowerForensics/Module/PowerForensicsv2/normnfc.nlp
deleted file mode 100644
index f198144..0000000
Binary files a/PowerForensics/Module/PowerForensicsv2/normnfc.nlp and /dev/null differ
diff --git a/PowerForensics/Module/PowerForensicsv2/normnfd.nlp b/PowerForensics/Module/PowerForensicsv2/normnfd.nlp
deleted file mode 100644
index 16e88e1..0000000
Binary files a/PowerForensics/Module/PowerForensicsv2/normnfd.nlp and /dev/null differ
diff --git a/PowerForensics/Module/PowerForensicsv2/normnfkc.nlp b/PowerForensics/Module/PowerForensicsv2/normnfkc.nlp
deleted file mode 100644
index 55406db..0000000
Binary files a/PowerForensics/Module/PowerForensicsv2/normnfkc.nlp and /dev/null differ
diff --git a/PowerForensics/Module/PowerForensicsv2/normnfkd.nlp b/PowerForensics/Module/PowerForensicsv2/normnfkd.nlp
deleted file mode 100644
index b7386c4..0000000
Binary files a/PowerForensics/Module/PowerForensicsv2/normnfkd.nlp and /dev/null differ
diff --git a/PowerForensics/PowerForensicsv2.csproj b/PowerForensics/PowerForensicsv2.csproj
index ab20368..4a3a355 100644
--- a/PowerForensics/PowerForensicsv2.csproj
+++ b/PowerForensics/PowerForensicsv2.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PowerForensicsv2</RootNamespace>
     <AssemblyName>PowerForensicsv2</AssemblyName>
-    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -20,25 +20,16 @@
     <OutputPath>Module\PowerForensicsv2\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <FrameworkPathOverride>C:\Windows\system32\DotNetCore\v1.0\</FrameworkPathOverride>
+    <WarningLevel>2</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>Module\PowerForensicsv2\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <FrameworkPathOverride>C:\Windows\system32\DotNetCore\v1.0\</FrameworkPathOverride>
+    <WarningLevel>2</WarningLevel>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Management.Automation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\Program Files\Reference Assemblies\Microsoft\WindowsPowerShell\v1.0\System.Management.Automation.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="src\Artifacts\Windows\ApplicationCompatibilityCache\RecentFileCache.cs" />
     <Compile Include="src\Artifacts\Windows\JavaCache.cs" />
@@ -170,6 +161,12 @@
     <Compile Include="src\Helper\NativeMethods.cs" />
     <Compile Include="Properties\AssemblyInfov2.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System.Management.Automation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\Windows\assembly\GAC_MSIL\System.Management.Automation\1.0.0.0__31bf3856ad364e35\System.Management.Automation.dll</HintPath>
+    </Reference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/PowerForensics/src/Artifacts/Windows/SoftwareHive/NetworkList.cs b/PowerForensics/src/Artifacts/Windows/SoftwareHive/NetworkList.cs
index 3c074f3..cac258f 100644
--- a/PowerForensics/src/Artifacts/Windows/SoftwareHive/NetworkList.cs
+++ b/PowerForensics/src/Artifacts/Windows/SoftwareHive/NetworkList.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Text;
 using System.Collections.Generic;
-using System.Net.NetworkInformation;
 using PowerForensics.Registry;
 
 namespace PowerForensics.Artifacts
diff --git a/PowerForensics/src/Helper/Helper.cs b/PowerForensics/src/Helper/Helper.cs
index 0bb4475..5476daf 100644
--- a/PowerForensics/src/Helper/Helper.cs
+++ b/PowerForensics/src/Helper/Helper.cs
@@ -9,12 +9,6 @@ public static class Helper
     {
         #region Helper Functions
 
-        public static bool testRegex(string volume)
-        {
-            System.Text.RegularExpressions.Regex regex = new System.Text.RegularExpressions.Regex(@"^(\\\\\.\\)?[A-Zaz]:$");
-            return regex.IsMatch(volume);
-        }
-
         internal static string getVolumeName(ref string volume)
         {
             if (volume == null)