diff --git a/scripts/cleanup-startmenu.cmd b/scripts/cleanup-startmenu.cmd
index 54b4c1a..9d216fd 100644
--- a/scripts/cleanup-startmenu.cmd
+++ b/scripts/cleanup-startmenu.cmd
@@ -1,5 +1,7 @@
 @echo off
 
+set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
+
 echo ####### %0 #######
 
 echo kill system processes and wait a short time ...
@@ -14,6 +16,14 @@ del %LOCALAPPDATA%\Packages\Microsoft.Windows.StartMenuExperienceHost_cw5n1h2txy
 del %LOCALAPPDATA%\Packages\Microsoft.Windows.ShellExperienceHost_cw5n1h2txyewy\TempState\* /q
 REG ADD "HKCU\Software\Microsoft\Windows\CurrentVersion\ImmersiveShell\StateStore" /V ResetCache /T REG_DWORD /D 1 /F
 
+echo removing useless entries in startmenu ...
+rd /S /Q %STARTMENU%\"Go Programming Language" 2>nul
+rd /S /Q %STARTMENU%\Maintenance 2>nul
+
+rem VLC ...
+move /Y %STARTMENU%\"VideoLan\VLC media player.lnk" %STARTMENU% 2>nul
+rd /S /Q %STARTMENU%\VideoLan 2>nul
+
 echo start explorer again ...
 ping 127.0.0.1 -n 3 >nul 2>nul
 start explorer.exe
diff --git a/tools/logon.cmd b/tools/logon.cmd
index 30b8f00..31a195b 100644
--- a/tools/logon.cmd
+++ b/tools/logon.cmd
@@ -14,9 +14,11 @@ echo set desktop colour ...
 echo starting BGInfo ...
 %TOOLS%\bginfo\bginfo64.exe %TOOLS%\bginfo\config.bgi /NOLICPROMPT /silent /timer:0
 
-rem #####
-rem ##### USER CONFIG FILES
-rem #####
+echo.
+echo #####
+echo ##### USER CONFIG FILES
+echo #####
+echo.
 
 rem SSH
 mkdir %USERPROFILE%\workspace 1>nul 2>nul
@@ -113,14 +115,17 @@ rem config must be full qualified pathname (OpenShell BUG!)
 set CONFIG=%TOOLS%\scripts\config\OpenshellSettings.xml
 "%ProgramFiles%\Open-Shell\StartMenu.exe" -xml %CONFIG%
 
-echo restarting explorer ...
-taskkill /f /im explorer.exe 1>nul 2>nul
-start explorer.exe
+rem ... stupid os problem #4
+echo removing some useless files ...
+del /F %APPDATA%\"Microsoft\Windows\Start Menu\Programs\Accessories\Internet Explorer.lnk" 2>nul
+del /F %APPDATA%\"Microsoft\Windows\Start Menu\Programs\Microsoft Edge.lnk" 2>nul 
+rd /S /Q %APPDATA%\"Microsoft\Windows\Start Menu\Programs\Maintenance" 2>nul
+del /F "%USERPROFILE%\Desktop\Microsoft Edge.lnk" 2>nul
 
-rem try to delete some useless files ...
-del /F "$APPDATA%\Microsoft\Windows\Start Menu\Programs\Accessories\Internet Explorer.lnk" 1>nul 2>nul
-del /F "%APPDATA%\Microsoft\Windows\Start Menu\Programs\Microsoft Edge.lnk" 1>nul 2>nul 
-del /F "%USERPROFILE%\Desktop\Microsoft Edge.lnk" 1>nul 2>nul
+echo restarting explorer ...
+taskkill /f /im explorer.exe 2>nul
+timeout /T 2
+start explorer.exe
 
 echo 1 >%STATUSFILE%