diff --git a/WPinternals.Core.csproj b/WPinternals.Core.csproj
deleted file mode 100644
index f4d8c3a..0000000
--- a/WPinternals.Core.csproj
+++ /dev/null
@@ -1,61 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <UseWPF>true</UseWPF>
-    <UseWindowsForms>true</UseWindowsForms>
-    
-    <AssemblyName>WPinternals</AssemblyName>
-    <RootNamespace>WPinternals</RootNamespace>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
-    <ApplicationIcon>WPinternals.ico</ApplicationIcon>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <Deterministic>False</Deterministic>
-	
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-	
-    <StartupObject>WPinternals.App</StartupObject>
-    <AssemblyOriginatorKeyFile>Heathcliff74.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <AssemblyOriginatorKeyFile>Heathcliff74.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Resource Include="Logo.png" />
-    <Resource Include="PhoneReboot.png" />
-    <Resource Include="WPinternals.ico" />
-    <Resource Include="aerobusy.gif" />
-    <Resource Include="Logo-Small.png" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="NETStandard.Library" Version="2.0.3" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.7.0" />
-    <PackageReference Include="System.IO.Ports" Version="4.7.0" />
-    <PackageReference Include="System.Management" Version="4.7.0" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Remove="PatchDefinitions.xml" />
-    <Content Remove="SB" />
-    <Content Remove="SBMSM" />
-    <Content Remove="SBA" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Remove="PhoneReboot.png" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="PatchDefinitions.xml" />
-    <EmbeddedResource Include="SB" />
-    <EmbeddedResource Include="SBMSM" />
-    <EmbeddedResource Include="SBA" />
-  </ItemGroup>
-  
-</Project>
\ No newline at end of file
diff --git a/WPinternals.Core.csproj.user b/WPinternals.Core.csproj.user
deleted file mode 100644
index c38f68c..0000000
--- a/WPinternals.Core.csproj.user
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <_LastSelectedProfileId>M:\Projects\WPinternals\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
-  </PropertyGroup>
-  <ItemGroup>
-    <Page Update="App.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="FilePickerControl.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\About.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\BackupView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\BootRestoreResourcesView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\BusyView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\ContextView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\DisclaimerAndNdaView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\DisclaimerView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\DumpRomView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\Empty.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\FlashResourcesView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\FlashRomView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\GettingStartedView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\LumiaDownloadView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\LumiaUndoRootTargetSelectionView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\LumiaUnlockRootTargetSelectionView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\MainWindow.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\MessageView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\NokiaFlashView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\NokiaLabelView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\NokiaMassStorageView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\NokiaModeFlashView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\NokiaModeLabelView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\NokiaModeMassStorageView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\NokiaModeNormalView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\NokiaNormalView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\NotImplementedView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\RegistrationView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\RestoreView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\StartupWindow.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-Test|AnyCPU'">
-    <StartArguments>-test</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-ReadGPT|AnyCPU'">
-    <StartArguments>-ReadGPT</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-DumpFFU|AnyCPU'">
-    <StartArguments>-DumpFFU "C:\ProgramData\WPinternals\Repository\RM-1085\RM1085_1078.0038.10586.13080.12547.033139_retail_prod_signed.ffu" "C:\ProgramData\WPinternals\Repository\RM-1085" "mainos"</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-TestProgrammer-930|AnyCPU'">
-    <StartArguments>-TestProgrammer "C:\ProgramData\WPInternals\Repository\RM-1045\MPRG8974_fh.ede"</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-FindFlashingProfile|AnyCPU'">
-    <StartArguments>-FindFlashingProfile</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-DisableSecureBoot|AnyCPU'">
-    <StartArguments>-EnableTestSigning</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-FindFlashingProfileNoRestart|AnyCPU'">
-    <StartArguments>-FindFlashingProfileNoRestart</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-DisableSecureBoot %28no restart%29|AnyCPU'">
-    <StartArguments>-EnableTestSigningNoRestart</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-ClearNV|AnyCPU'">
-    <StartArguments>-ClearNV</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-DumpUEFI|AnyCPU'">
-    <StartArguments>-DumpUEFI "C:\ProgramData\WPinternals\Repository\RM-1085\UEFI.bin" "C:\ProgramData\WPinternals\Repository\RM-1085\UEFI"</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-MSM|AnyCPU'">
-    <StartArguments>-SwitchToMassStorageMode</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-SwitchToMSM|AnyCPU'">
-    <StartArguments>-test</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-UnlockBootloader|AnyCPU'">
-    <StartAction>Project</StartAction>
-    <StartArguments>-UnlockBootloader</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-DLEmergency|AnyCPU'">
-    <StartArguments>-DownloadEmergencyByProductType RM-1085</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-ShowPhoneInfo|AnyCPU'">
-    <StartArguments>-ShowPhoneInfo</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-RelockPhone|AnyCPU'">
-    <StartArguments>-RelockPhone</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-EnableRootAccess|AnyCPU'">
-    <StartArguments>-EnableRootAccess</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-TestProgrammer-950|AnyCPU'">
-    <StartArguments>-TestProgrammer "C:\ProgramData\WPInternals\Repository\RM-1085\MPRG8994_fh.ede"</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-FixBoot|AnyCPU'">
-    <StartArguments>-FixBootAfterUnlockingBootloader</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-DLFFU|AnyCPU'">
-    <StartArguments>-downloadffubyproductcode 059R016</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-FlashFFU-RM1085|AnyCPU'">
-    <StartArguments>-FlashFFU "C:\ProgramData\WPinternals\Repository\RM-1085\RM1085_1078.0038.10586.13080.12547.033139_retail_prod_signed.ffu"</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-Test|AnyCPU'">
-    <StartArguments>-Test</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-TestProgrammer-630|AnyCPU'">
-    <StartArguments>-TestProgrammer "C:\ProgramData\WPInternals\Repository\RM-976\MPRG8x26_fh.ede"</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-DLall|AnyCPU'">
-    <StartArguments>-DownloadAll C:\Temp</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-AddEmergency|AnyCPU'">
-    <StartArguments>-AddEmergency RM-1085 "C:\ProgramData\WPinternals\Repository\RM-1085\MPRG8994_fh.ede" "C:\ProgramData\WPinternals\Repository\RM-1085\RM1085_fh.edp"</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-TestProgrammer-640|AnyCPU'">
-    <StartArguments>-TestProgrammer "C:\ProgramData\WPInternals\Repository\RM-1073\MPRG8x26_fh.ede"</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-TestProgrammer-550|AnyCPU'">
-    <StartArguments>-TestProgrammer "C:\ProgramData\WPInternals\Repository\RM-1127\MPRG8909_fh.ede"</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-TestProgrammer-650|AnyCPU'">
-    <StartArguments>-TestProgrammer "C:\ProgramData\WPInternals\Repository\RM-1152\MPRG8909_fh.ede"</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-Help|AnyCPU'">
-    <StartArguments>-%3f</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-ShowFFU|AnyCPU'">
-    <StartArguments>-ShowFFU "C:\ProgramData\WPInternals\Repository\RM-1152\RM1152_1078.0042.10586.13333.15672.0352EF_retail_prod_signed.ffu"</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-BackupGPT|AnyCPU'">
-    <StartArguments>/BackupGPT "C:\Temp\Partitions.xml"</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-MergeGptXmlXml|AnyCPU'">
-    <StartArguments>-MergeGPT "C:\Temp\Partitions.xml" "C:\Temp\MergePartitions.xml"</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-MergeGptXmlZip|AnyCPU'">
-    <StartArguments>-MergeGPT "C:\Temp\OriginalGPT.xml" "C:\Temp\TestROM.zip"</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Preview-Test|AnyCPU'">
-    <StartArguments>/Test</StartArguments>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/WPinternals.sln b/WPinternals.sln
index c75e285..708833c 100644
--- a/WPinternals.sln
+++ b/WPinternals.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.29123.89
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPinternals", "WPinternals.csproj", "{AED6DEB8-F54C-4B41-9655-793E7096AE6E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WPinternals.Core", "WPinternals.Core.csproj", "{AED6DEB8-F54C-4B41-9655-793E7096AE6F}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU