diff --git a/msvc/winConfigDebug.bat b/msvc/winConfigDebug.bat
index 3ba96c1..cb48d0e 100644
--- a/msvc/winConfigDebug.bat
+++ b/msvc/winConfigDebug.bat
@@ -3,35 +3,40 @@ echo exists to make sure no other libraries are around
 echo off
 call C:\"Program Files (x86)"\"Microsoft Visual Studio"\2022\BuildTools\VC\Auxiliary\Build\vcvarsamd64_x86.bat
 call C:\"Program Files"\"Microsoft Visual Studio"\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
-del /Q build
-del /Q libsodium\obj
-del /Q libsodium\bin
-del /Q libsodium\src\libsodium\include\sodium\version.h
-cd mpir
+
+echo on
+rmdir /Q /S build
+rmdir /Q /S msvc\.vs
+cd libsodium
+rmdir /Q /S bin
+rmdir /Q /S obj
+del src\libsodium\include\sodium\version.h
+cd ..\mpir
+rmdir /Q /S lib
 del config.h
 del gmp-mparam.h
 del gmp.h
-del /Q lib
 del longlong.h
 del mpir.h
 del msvc\output_params.bat
-del msvc\tmp.h
-del /Q msvc\vs22\lib_mpir_cxx\x64
-del /Q msvc\vs22\lib_mpir_gc\x64
+rmdir /Q /S msvc\vs22\lib_mpir_cxx\x64
+rmdir /Q /S msvc\vs22\lib_mpir_gc\x64
 del msvc\vs22\test-config.props
-cd ..\wxWidgets
-del /Q build\msw\vc_x64_mswu
-del /Q  build\msw\vc_x64_mswud
-del /Q  lib\vc_x64_lib
+cd ..
+cd wxWidgets
+rmdir /Q /S build\msw\vc_x64_mswu
+rmdir /Q /S build\msw\vc_x64_mswud
+rmdir /Q /S lib\vc_x64_lib
 cd ..
 echo check to see that everything is cleaned
-echo off
-git submodule foreach --recursive "git clean -xnf"
-git clean -xnf
+rem echo off
+git clean -xdn
+git submodule foreach git clean -xdn
 PAUSE
 echo on
 
-cd libsodium/builds/msvc/vs2022
+echo on
+cd libsodium\builds\msvc\vs2022
 msbuild libsodium.sln -p:Configuration=StaticDebug;Platform=x64 -m
 echo off
 IF %ERRORLEVEL% NEQ 0 (
diff --git a/msvc/winConfigRelease.bat b/msvc/winConfigRelease.bat
index 8093208..44524d4 100644
--- a/msvc/winConfigRelease.bat
+++ b/msvc/winConfigRelease.bat
@@ -3,34 +3,40 @@ echo exists to make sure no other libraries are around
 echo off
 call C:\"Program Files (x86)"\"Microsoft Visual Studio"\2022\BuildTools\VC\Auxiliary\Build\vcvarsamd64_x86.bat
 call C:\"Program Files"\"Microsoft Visual Studio"\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
-del /Q build
-del /Q libsodium\obj
-del /Q libsodium\bin
-del /Q libsodium\src\libsodium\include\sodium\version.h
-cd mpir
+
+echo on
+rmdir /Q /S build
+rmdir /Q /S msvc\.vs
+cd libsodium
+rmdir /Q /S bin
+rmdir /Q /S obj
+del src\libsodium\include\sodium\version.h
+cd ..\mpir
+rmdir /Q /S lib
 del config.h
 del gmp-mparam.h
 del gmp.h
-del /Q lib
 del longlong.h
 del mpir.h
 del msvc\output_params.bat
-del msvc\tmp.h
-del /Q msvc\vs22\lib_mpir_cxx\x64
-del /Q msvc\vs22\lib_mpir_gc\x64
+rmdir /Q /S msvc\vs22\lib_mpir_cxx\x64
+rmdir /Q /S msvc\vs22\lib_mpir_gc\x64
 del msvc\vs22\test-config.props
-cd ..\wxWidgets
-del /Q build\msw\vc_x64_mswu
-del /Q  build\msw\vc_x64_mswud
-del /Q  lib\vc_x64_lib
+cd ..
+cd wxWidgets
+rmdir /Q /S build\msw\vc_x64_mswu
+rmdir /Q /S build\msw\vc_x64_mswud
+rmdir /Q /S lib\vc_x64_lib
 cd ..
 echo check to see that everything is cleaned
-echo off
-git submodule foreach --recursive "git clean -xnf"
-git clean -xnf
+rem echo off
+git clean -xdn
+git submodule foreach git clean -xdn
 PAUSE
 echo on
-cd libsodium/builds/msvc/vs2022
+
+echo on
+cd libsodium\builds\msvc\vs2022
 msbuild libsodium.sln -p:Configuration=StaticRelease;Platform=x64 -m
 echo off
 IF %ERRORLEVEL% NEQ 0 (
@@ -49,22 +55,7 @@ IF %ERRORLEVEL% NEQ 0 (
 	PAUSE
 	GOTO:EOF
 )
-echo on
-call msbuild.bat gc lib x64 Release test
-echo off
-IF %ERRORLEVEL% NEQ 0 (
-	cd ..
-	PAUSE
-	GOTO:EOF
-)
-echo on
-call msbuild.bat gc lib x64 Release tune
-echo off
-IF %ERRORLEVEL% NEQ 0 (
-	cd ..
-	PAUSE
-	GOTO:EOF
-)
+
 echo on
 cd ..\..\..
 cd wxWidgets\build\msw