diff --git a/GenerateProjectFiles.bat b/GenerateProjectFiles.bat
index 3c681bcaa..5db8aaf55 100644
--- a/GenerateProjectFiles.bat
+++ b/GenerateProjectFiles.bat
@@ -6,34 +6,18 @@ setlocal
 pushd
 echo Generating Flax Engine project files...
 
-rem Make sure the batch file exists in the root folder.
-if not exist "%~dp0\Source" goto Error_BatchFileInWrongLocation
-if not exist "Development\Scripts\Windows\CallBuildTool.bat" goto Error_BatchFileInWrongLocation
-
 rem Run Flax.Build to generate Visual Studio solution and project files (also pass the arguments)
 call "Development\Scripts\Windows\CallBuildTool.bat" -genproject %*
-if errorlevel 1 goto Error_BuildToolFailed
+if errorlevel 1 goto BuildToolFailed
 
-rem Done.
 popd
 echo Done!
 exit /B 0
 
-:Error_BatchFileInWrongLocation
-echo.
-echo The batch file does not appear to be located in the root directory. This script must be run from within that directory.
-echo.
-pause
-goto Exit
-
-:Error_BuildToolFailed
-echo.
+:BuildToolFailed
 echo Flax.Build tool failed.
-echo.
-pause
 goto Exit
 
 :Exit
-rem Restore original directory before exit.
 popd
 exit /B 1
diff --git a/PackageAll.bat b/PackageAll.bat
index da9113aa5..95bf040a8 100644
--- a/PackageAll.bat
+++ b/PackageAll.bat
@@ -6,32 +6,18 @@ setlocal
 pushd
 echo Performing the full package...
 
-rem Make sure the batch file exists in the root folder.
-if not exist "%~dp0\Source" goto Error_BatchFileInWrongLocation
-if not exist "Development\Scripts\Windows\CallBuildTool.bat" goto Error_BatchFileInWrongLocation
-
 rem Run the build tool.
 call "Development\Scripts\Windows\CallBuildTool.bat" -deploy -deployEditor -deployPlatforms -verbose -log -logFile="Cache\Intermediate\PackageLog.txt" %*
-if errorlevel 1 goto Error_BuildToolFailed
+if errorlevel 1 goto BuildToolFailed
 
-rem Done.
 popd
 echo Done!
 exit /B 0
 
-:Error_BatchFileInWrongLocation
-echo.
-echo The batch file does not appear to be located in the root directory. This script must be run from within that directory.
-echo.
-goto Exit
-
-:Error_BuildToolFailed
-echo.
+:BuildToolFailed
 echo Flax.Build tool failed.
-echo.
 goto Exit
 
 :Exit
-rem Restore original directory before exit.
 popd
 exit /B 1
diff --git a/PackageEditor.bat b/PackageEditor.bat
index 7d7249e52..1590ab40c 100644
--- a/PackageEditor.bat
+++ b/PackageEditor.bat
@@ -6,32 +6,18 @@ setlocal
 pushd
 echo Building and packaging Flax Editor...
 
-rem Make sure the batch file exists in the root folder.
-if not exist "%~dp0\Source" goto Error_BatchFileInWrongLocation
-if not exist "Development\Scripts\Windows\CallBuildTool.bat" goto Error_BatchFileInWrongLocation
-
-rem Run Flax.Build to generate Visual Studio solution and project files (also pass the arguments)
+rem Run the build tool.
 call "Development\Scripts\Windows\CallBuildTool.bat" -deploy -deployEditor -verbose -log -logFile="Cache\Intermediate\PackageLog.txt" %*
-if errorlevel 1 goto Error_BuildToolFailed
+if errorlevel 1 goto BuildToolFailed
 
-rem Done.
 popd
 echo Done!
 exit /B 0
 
-:Error_BatchFileInWrongLocation
-echo.
-echo The batch file does not appear to be located in the root directory. This script must be run from within that directory.
-echo.
-goto Exit
-
-:Error_BuildToolFailed
-echo.
+:BuildToolFailed
 echo Flax.Build tool failed.
-echo.
 goto Exit
 
 :Exit
-rem Restore original directory before exit.
 popd
 exit /B 1
diff --git a/PackagePlatforms.bat b/PackagePlatforms.bat
index 80cbd9ec5..c1eb954f5 100644
--- a/PackagePlatforms.bat
+++ b/PackagePlatforms.bat
@@ -6,32 +6,18 @@ setlocal
 pushd
 echo Building and packaging platforms data...
 
-rem Make sure the batch file exists in the root folder.
-if not exist "%~dp0\Source" goto Error_BatchFileInWrongLocation
-if not exist "Development\Scripts\Windows\CallBuildTool.bat" goto Error_BatchFileInWrongLocation
-
-rem Run Flax.Build to generate Visual Studio solution and project files (also pass the arguments)
+rem Run the build tool.
 call "Development\Scripts\Windows\CallBuildTool.bat" -deploy -deployPlatforms -verbose -log -logFile="Cache\Intermediate\PackageLog.txt" %*
-if errorlevel 1 goto Error_BuildToolFailed
+if errorlevel 1 goto BuildToolFailed
 
-rem Done.
 popd
 echo Done!
 exit /B 0
 
-:Error_BatchFileInWrongLocation
-echo.
-echo The batch file does not appear to be located in the root directory. This script must be run from within that directory.
-echo.
-goto Exit
-
-:Error_BuildToolFailed
-echo.
+:BuildToolFailed
 echo Flax.Build tool failed.
-echo.
 goto Exit
 
 :Exit
-rem Restore original directory before exit.
 popd
 exit /B 1
diff --git a/RegisterEngineLocation.bat b/RegisterEngineLocation.bat
index bb1a915a3..bd8c32cee 100644
--- a/RegisterEngineLocation.bat
+++ b/RegisterEngineLocation.bat
@@ -14,12 +14,12 @@ if not exist "%appdata%\Flax\Versions.txt" (
 )
 set EngineLocation=%cd%
 find /c "%EngineLocation%" "%appdata%\Flax\Versions.txt"
-if %errorlevel% equ 1 goto notfound
+if %errorlevel% equ 1 goto NotFound
 echo Already registered.
 goto Done
 
 rem Register the location (append to the end)
-:notfound
+:NotFound
 echo Location '%EngineLocation%' is not registered. Adding it to the list of engine versions.
 echo %EngineLocation%>>"%appdata%\Flax\Versions.txt"
 goto Done
@@ -31,6 +31,5 @@ echo Done!
 exit /B 0
 
 :Exit
-rem Restore original directory before exit.
 popd
 exit /B 1