diff --git a/.travis.yml b/.travis.yml
index 719f4e1a3..9cc93f76c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -65,13 +65,11 @@ jobs:
           python -m aqt install --outputdir /C/Qt $QT_VERSION windows desktop win64_msvc2017_64 -m qtbase && \
           python -m aqt tool --outputdir /C/Qt windows tools_ifw $QIF_VERSION qt.tools.ifw.${QIF_VERSION/./}; \
           fi
-        - echo call \""C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\Common7\\Tools\\VsDevCmd.bat\"" > winbuild.bat
         - echo set BUILD_ARCH=$BUILD_ARCH >> winbuild.bat
         - echo set QT_BIN_DIR="$QT_BIN_DIR" >> winbuild.bat
         - echo set QIF_BIN_DIR="$QIF_BIN_DIR" >> winbuild.bat
         - echo call \""C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvars${BUILD_ARCH}.bat\"" >> winbuild.bat
         - echo set WIN_CERT_PW=$WIN_CERT_PW >> winbuild.bat
-        - echo echo Starting build with build_windows.bat >> winbuild.bat
         - echo call deploy\\build_windows.bat >> winbuild.bat
         - cmd //c winbuild.bat
 
@@ -111,7 +109,6 @@ jobs:
           python -m aqt install --outputdir /C/Qt $QT_VERSION windows desktop win32_msvc2017 -m qtbase && \
           python -m aqt tool --outputdir /C/Qt windows tools_ifw $QIF_VERSION qt.tools.ifw.${QIF_VERSION/./}; \
           fi
-        - echo call \""C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\Common7\\Tools\\VsDevCmd.bat\"" > winbuild.bat
         - echo set BUILD_ARCH=$BUILD_ARCH >> winbuild.bat
         - echo set QT_BIN_DIR="$QT_BIN_DIR" >> winbuild.bat
         - echo set QIF_BIN_DIR="$QIF_BIN_DIR" >> winbuild.bat
diff --git a/deploy/windows-env.bat b/deploy/windows-env.bat
deleted file mode 100644
index fc14b825e..000000000
--- a/deploy/windows-env.bat
+++ /dev/null
@@ -1 +0,0 @@
-"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat"
diff --git a/deploy/windows.bat b/deploy/windows.bat
deleted file mode 100644
index 8fee76145..000000000
--- a/deploy/windows.bat
+++ /dev/null
@@ -1,72 +0,0 @@
- @ECHO OFF
-
-CHCP 1252
-
-SET QT_BIN_DIR="c:\Qt\5.14.2\msvc2017\bin"
-SET QIF_BIN_DIR="c:\Qt\Tools\QtInstallerFramework\4.0\bin"
-
-set APP_NAME=AmneziaVPN
-set APP_FILENAME=%APP_NAME:"=%.exe
-set APP_DOMAIN=org.amneziavpn.package
-set LAUNCH_DIR=%cd%
-set TOP_DIR=%LAUNCH_DIR:"=%\..
-set RELEASE_DIR=%TOP_DIR:"=%\..\%APP_NAME:"=%-build
-set OUT_APP_DIR=%RELEASE_DIR:"=%\client\release
-set DEPLOY_DATA_DIR=%LAUNCH_DIR:"=%\data\windows
-set INSTALLER_DATA_DIR=%RELEASE_DIR:"=%\installer\packages\%APP_DOMAIN:"=%\data
-set PRO_FILE_PATH=%TOP_DIR:"=%\%APP_NAME:"=%.pro
-set QMAKE_STASH_FILE=%TOP_DIR:"=%\.qmake_stash
-set TARGET_FILENAME=%TOP_DIR:"=%\%APP_NAME:"=%.exe
-
-echo "Environment:"
-echo "APP_FILENAME:			%APP_FILENAME%"
-echo "LAUNCH_DIR:			%LAUNCH_DIR%"
-echo "TOP_DIR:			%TOP_DIR%"
-echo "RELEASE_DIR:			%RELEASE_DIR%"
-echo "OUT_APP_DIR:			%OUT_APP_DIR%"
-echo "DEPLOY_DATA_DIR: 		%DEPLOY_DATA_DIR%"
-echo "INSTALLER_DATA_DIR: 		%INSTALLER_DATA_DIR%"
-echo "PRO_FILE_PATH: 		%PRO_FILE_PATH%"
-echo "QMAKE_STASH_FILE: 		%QMAKE_STASH_FILE%"
-echo "TARGET_FILENAME: 		%TARGET_FILENAME%"
-
-echo "Cleanup..."
-Rmdir /Q /S %RELEASE_DIR%
-Del %QMAKE_STASH_FILE%
-Del %TARGET_FILENAME%
-
-
-cd %TOP_DIR%
-"%QT_BIN_DIR:"=%\qmake" %PRO_FILE_PATH% -spec win32-msvc
-set CL=/MP
-nmake /A /NOLOGO
-del "%OUT_APP_DIR:"=%\*.obj"
-del "%OUT_APP_DIR:"=%\*.cpp"
-del "%OUT_APP_DIR:"=%\*.h"
-del "%OUT_APP_DIR:"=%\*.res"
-del "%OUT_APP_DIR:"=%\*.o"
-del "%OUT_APP_DIR:"=%\*.moc"
-del "%OUT_APP_DIR:"=%\*.lib"
-del "%OUT_APP_DIR:"=%\*.exp"
-echo "Deploying..."
-"%QT_BIN_DIR:"=%\windeployqt" --release --force --no-translations "%OUT_APP_DIR:"=%\%APP_FILENAME:"=%"
-echo "Copying deploy data..."
-xcopy %DEPLOY_DATA_DIR% 											%OUT_APP_DIR%  /s /e /y /i /f
-copy "%RELEASE_DIR:"=%\server\release\%APP_NAME:"=%-service.exe"	%OUT_APP_DIR%
-copy "%RELEASE_DIR:"=%\post-uninstall\release\post-uninstall.exe"	%OUT_APP_DIR%
-
-cd %LAUNCH_DIR%
-xcopy %LAUNCH_DIR:"=%\installer 									%RELEASE_DIR:"=%\installer /s /e /y /i /f
-mkdir %INSTALLER_DATA_DIR%
-
-cd %OUT_APP_DIR%
-echo "Compressing data..."
-"%QIF_BIN_DIR:"=%\archivegen" -c 9 %INSTALLER_DATA_DIR:"=%\%APP_NAME:"=%.7z ./
-
-cd "%RELEASE_DIR:"=%\installer"
-echo "Creating installer..."
-"%QIF_BIN_DIR:"=%\binarycreator" --offline-only -v -c config\windows.xml -p packages -f %TARGET_FILENAME%
-
-
-cd %LAUNCH_DIR%
-echo "Finished, see %TARGET_FILENAME%"