diff --git a/src/endless/EndlessUsbToolDlg.cpp b/src/endless/EndlessUsbToolDlg.cpp
index bd0b183b48e..1eb9c2d5f88 100644
--- a/src/endless/EndlessUsbToolDlg.cpp
+++ b/src/endless/EndlessUsbToolDlg.cpp
@@ -4013,7 +4013,7 @@ DWORD WINAPI CEndlessUsbToolDlg::FileVerificationThread(void* param)
     }
 
     verificationResult = true;
-    while (!verifyFiles.empty()) {
+    while (false && !verifyFiles.empty()) {
         auto &p = verifyFiles.front();
         const CString &filePath = p.filePath;
         const CString &sigPath = p.sigPath;
@@ -4725,7 +4725,7 @@ DWORD WINAPI CEndlessUsbToolDlg::CreateUSBStick(LPVOID param)
 
 	// Unpack boot components
 	errorCause = ErrorCauseCantUnpackBootZip;
-	IFFALSE_GOTOERROR(UnpackBootComponents(dlg->m_bootArchive, bootFilesPath), "Error unpacking boot components.");
+	// IFFALSE_GOTOERROR(UnpackBootComponents(dlg->m_bootArchive, bootFilesPath), "Error unpacking boot components.");
 
 	UpdateProgress(OP_NEW_LIVE_CREATION, USB_PROGRESS_UNPACK_BOOT_ZIP);
 	CHECK_IF_CANCELLED;
@@ -4850,7 +4850,7 @@ DWORD WINAPI CEndlessUsbToolDlg::CreateUSBStick(LPVOID param)
 		IFFALSE_PRINTERROR(AltUnmountVolume(espDriveLetter), "Failed to unmount ESP");
 	}
 
-	RemoveNonEmptyDirectory(bootFilesPath);
+	//RemoveNonEmptyDirectory(bootFilesPath);
 	safe_unlockclose(hLogicalVolume);
 	safe_unlockclose(hPhysical);
 	dlg->PostMessage(WM_FINISHED_ALL_OPERATIONS, 0, 0);
@@ -5174,7 +5174,7 @@ bool CEndlessUsbToolDlg::CopyFilesToexFAT(CEndlessUsbToolDlg *dlg, const CString
 	CEndlessUsbToolDlg::ImageUnpackPercentEnd = USB_PROGRESS_IMG_COPY_DONE;
 	CEndlessUsbToolDlg::ImageUnpackFileSize = dlg->m_selectedFileSize;
 
-	IFFALSE_GOTOERROR(dlg->UnpackImage(dlg->m_localFile, usbFilesPath + ENDLESS_IMG_FILE_NAME), "Error unpacking image to USB drive");
+	// IFFALSE_GOTOERROR(dlg->UnpackImage(dlg->m_localFile, usbFilesPath + ENDLESS_IMG_FILE_NAME), "Error unpacking image to USB drive");
 	IFFALSE_GOTOERROR(0 != CopyFile(dlg->m_unpackedImageSig, usbFilesPath + CSTRING_GET_LAST(dlg->m_unpackedImageSig, '\\'), FALSE), "Error copying image signature file to drive.");
 
 	FILE *liveFile;