diff --git a/lcl/interfaces/win32/win32int.pp b/lcl/interfaces/win32/win32int.pp
index dc91ba550d..f9819a55df 100644
--- a/lcl/interfaces/win32/win32int.pp
+++ b/lcl/interfaces/win32/win32int.pp
@@ -287,9 +287,7 @@ var
 {$I win32winapi.inc}
 {$I win32lclintf.inc}
 
-const
-  W95_MENUITEMINFO_SIZE = 44;
-  
+
 initialization
   { initialize mousedownclick to far before double click time }
   if GetTickCount > 5000 then
@@ -298,9 +296,7 @@ initialization
     MouseDownTime := 0;
   SystemCharSetIsUTF8:=true;
 
-  if (Win32MajorVersion = 4) and (Win32MinorVersion = 0)
-  then MMenuItemInfoSize := W95_MENUITEMINFO_SIZE
-  else MMenuItemInfoSize := sizeof(MENUITEMINFO);
+  MMenuItemInfoSize := sizeof(MENUITEMINFO);
   
   // Vista with classic theme is buggy with Windows.SetPixel() 
   // http://bugs.freepascal.org/view.php?id=15822
diff --git a/lcl/interfaces/win32/win32proc.pp b/lcl/interfaces/win32/win32proc.pp
index e7d3482e94..115aea5aed 100644
--- a/lcl/interfaces/win32/win32proc.pp
+++ b/lcl/interfaces/win32/win32proc.pp
@@ -1639,7 +1639,6 @@ begin
   DefaultWindowInfo.DrawItemIndex := -1;
   WindowInfoAtom := Windows.GlobalAddAtom('WindowInfo');
   ChangedMenus := TFPList.Create;
-  //UnicodeEnabledOS := (Win32Platform = VER_PLATFORM_WIN32_NT);
   if WindowsVersion = wvUnknown then
     UpdateWindowsVersion;
 end;