diff --git a/swig/win_csharp.bat b/swig/win_csharp.bat
index 3cb35fa39fa6e169f8848ed08f7e78822f5e8792..82bb1bfc2e95c8737cd19709d2b2a0ccc9f48205 100644
--- a/swig/win_csharp.bat
+++ b/swig/win_csharp.bat
@@ -1,7 +1,6 @@
-call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
-mkdir com\hb3344\ademco
-"C:\Users\Jack\Downloads\swigwin-4.0.2\swig.exe" -csharp -namespace com.hb3344.ademco -outdir com/hb3344/ademco -o libademco_csharp_wrap.c libademco.swig
-cl -c ../ademco.c ../hb_com.c libademco_csharp_wrap.c -I"../"
-cl -LD ademco.obj hb_com.obj libademco_csharp_wrap.obj -o libademco.dll
-csc CSharpDemo.cs -recurse:com/hb3344/ademco/*.cs
-rem CSharpDemo.exe
+mkdir com\hb3344\ademco
+"C:\Users\Jack\Downloads\swigwin-4.0.2\swig.exe" -csharp -namespace com.hb3344.ademco -outdir com/hb3344/ademco -o libademco_csharp_wrap.c libademco.swig
+cl -c ../ademco.c ../hb_com.c libademco_csharp_wrap.c -I"../"
+cl -LD ademco.obj hb_com.obj libademco_csharp_wrap.obj -o libademco.dll
+csc CSharpDemo.cs -recurse:com/hb3344/ademco/*.cs
+rem CSharpDemo.exe
diff --git a/swig/win_java.bat b/swig/win_java.bat
index 85dab8f777c0af13dc218f6ca0e3bdbe60a2d9f9..4f7bf10b39831d952c0f176bf009891a5e523818 100644
--- a/swig/win_java.bat
+++ b/swig/win_java.bat
@@ -1,7 +1,6 @@
-call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
-mkdir com\hb3344\ademco
-"C:\Users\Jack\Downloads\swigwin-4.0.2\swig.exe" -java -package com.hb3344.ademco -outdir com/hb3344/ademco -o libademco_java_wrap.c libademco.swig
-cl -c ../ademco.c ../hb_com.c libademco_java_wrap.c -I"../" -I"%JAVA_HOME%include" -I"%JAVA_HOME%include/win32"
-cl -LD ademco.obj hb_com.obj libademco_java_wrap.obj -o ademco_java.dll
-javac -encoding utf-8 JavaDemo.java
-rem java JavaDemo
+mkdir com\hb3344\ademco
+"C:\Users\Jack\Downloads\swigwin-4.0.2\swig.exe" -java -package com.hb3344.ademco -outdir com/hb3344/ademco -o libademco_java_wrap.c libademco.swig
+cl -c ../ademco.c ../hb_com.c libademco_java_wrap.c -I"../" -I"%JAVA_HOME%include" -I"%JAVA_HOME%include/win32"
+cl -LD ademco.obj hb_com.obj libademco_java_wrap.obj -o ademco_java.dll
+javac -encoding utf-8 JavaDemo.java
+rem java JavaDemo
diff --git a/swig/win_node.bat b/swig/win_node.bat
index accd3e25947ce64b43c155c25208c9f5e00a4c01..157b2266ad5c3fdca4c6c53de70c432ae52b2d18 100644
--- a/swig/win_node.bat
+++ b/swig/win_node.bat
@@ -1,4 +1,3 @@
-call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
-C:\Users\Jack\Downloads\swigwin-4.1.1\swig.exe -c++ -javascript -node libademco.swig
-node-gyp configure build
-rem node nodejs-demo.js
+C:\Users\Jack\Downloads\swigwin-4.1.1\swig.exe -c++ -javascript -node libademco.swig
+node-gyp configure build
+rem node nodejs-demo.js