diff --git a/editor/Editor.cpp b/editor/Editor.cpp
index 6b857b2..b5318e5 100644
--- a/editor/Editor.cpp
+++ b/editor/Editor.cpp
@@ -100,44 +100,6 @@ int CEditor::GetMenuItemPosition(HANDLE hMenu, TCHAR* text)
 	return result;
 }
 
-int CEditor::GetMenuItemPosition(HANDLE hMenu, TCHAR* text)
-{
-	int count = GetMenuItemCount(m_mainMenu);
-	int result = count -1;
-
-	MENUITEMINFO mii;
-	mii.cbSize = sizeof(mii);
-	mii.fMask = MIIM_STRING;
-	mii.fType = MFT_STRING;
-
-	size_t len;
-	if (FAILED(StringCchLength(text, 100, &len)))
-		return result;
-
-	size_t bufferSize = len + 1 + 1; // one character more + one for \0
-	mii.dwTypeData = new TCHAR[bufferSize];
-
-	for (int i = 0; i < count; i++) {
-		mii.cch = bufferSize;
-
-		BOOL res = GetMenuItemInfo(
-			m_mainMenu,
-			(UINT)i,
-			TRUE,
-			&mii
-		);
-
-		if (StrCmp(mii.dwTypeData, text) == 0) {
-			result = i;
-			break;
-		}
-	}
-
-	delete mii.dwTypeData;
-
-	return result;
-}
-
 // 1.) NPP uses IDs for  menu items but does not offer API
 // to get new IDs for our dynamic menu items. Due to solve 
 // this problem switch menu message handling from WM_COMMAND to WM_MENUCOMMAND
diff --git a/editor/Editor.h b/editor/Editor.h
index 8f4c194..4af0832 100644
Binary files a/editor/Editor.h and b/editor/Editor.h differ
diff --git a/jN.vcxproj b/jN.vcxproj
index 154ba25..4d13ada 100644
--- a/jN.vcxproj
+++ b/jN.vcxproj
@@ -27,6 +27,7 @@
     <BuildNumber>0</BuildNumber>
     <VersionRevision>0</VersionRevision>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
@@ -38,18 +39,6 @@
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
diff --git a/tests/tests.vcxproj b/tests/tests.vcxproj
index 60be12c..9f7fdf7 100644
--- a/tests/tests.vcxproj
+++ b/tests/tests.vcxproj
@@ -41,12 +41,8 @@
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
     <Import Project="..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets" Condition="Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets')" />
   </ImportGroup>
-  <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
-  </ImportGroup>
   <ItemDefinitionGroup>
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -56,12 +52,15 @@
       <RuntimeLibrary Condition="'$(Configuration)'=='Debug'">MultiThreadedDebugDLL</RuntimeLibrary>
       <RuntimeLibrary Condition="'$(Configuration)'=='Release'">MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
+      <WholeProgramOptimization Condition="'$(Configuration)'=='Release'">true</WholeProgramOptimization>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <AdditionalDependencies Condition="'$(Platform)'=='Win32'">$(MSBuildProjectDirectory)\..\$(Configuration)\*.obj;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalDependencies Condition="'$(Platform)'=='x64'">$(MSBuildProjectDirectory)\..\x64\$(Configuration)\*.obj;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <LinkTimeCodeGeneration Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <LinkTimeCodeGeneration Condition="'$(Configuration)|$(Platform)'=='Release|x64'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">