diff --git a/cores/esp32/main.cpp b/cores/esp32/main.cpp
index 4277b35e..c2300b41 100644
--- a/cores/esp32/main.cpp
+++ b/cores/esp32/main.cpp
@@ -19,40 +19,3 @@ extern "C" void app_main()
 }
 
 #endif
-
-/*
-**  Block below to be removed with next toolchain
-*/
-void *operator new(size_t size)
-{
-    return malloc(size);
-}
-
-void *operator new[](size_t size)
-{
-    return malloc(size);
-}
-
-void operator delete(void * ptr)
-{
-    free(ptr);
-}
-
-void operator delete[](void * ptr)
-{
-    free(ptr);
-}
-
-extern "C" void __cxa_pure_virtual(void) __attribute__ ((__noreturn__));
-extern "C" void __cxa_deleted_virtual(void) __attribute__ ((__noreturn__));
-
-void __cxa_pure_virtual(void)
-{
-    abort();
-}
-
-void __cxa_deleted_virtual(void)
-{
-    abort();
-}
-
diff --git a/libraries/WiFi/examples/WiFiIPv6/WiFiIPv6.ino b/libraries/WiFi/examples/WiFiIPv6/WiFiIPv6.ino
index 15803876..2d3b6978 100644
--- a/libraries/WiFi/examples/WiFiIPv6/WiFiIPv6.ino
+++ b/libraries/WiFi/examples/WiFiIPv6/WiFiIPv6.ino
@@ -1,8 +1,8 @@
 #include "WiFi.h"
 
-#define STA_SSID "nbis-test"
-#define STA_PASS "1234567890"
-#define AP_SSID  "esp32"
+#define STA_SSID "**********"
+#define STA_PASS "**********"
+#define AP_SSID  "esp32-v6"
 
 static volatile bool wifi_connected = false;
 
diff --git a/package/package_esp32_index.template.json b/package/package_esp32_index.template.json
index b5bfd62e..4ecbba7e 100644
--- a/package/package_esp32_index.template.json
+++ b/package/package_esp32_index.template.json
@@ -45,10 +45,10 @@
           "systems": [
             {
               "host": "i686-mingw32",
-              "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-59.zip",
-              "archiveFileName": "xtensa-esp32-elf-win32-1.22.0-59.zip",
-              "checksum": "SHA-256:10476b9c11a7a90f40883413ddfb409f505b20692e316c4e597c4c175b4be09c",
-              "size": "153527527"
+              "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-61-gab8375a-5.2.0-2.zip",
+              "archiveFileName": "xtensa-esp32-elf-win32-1.22.0-61-gab8375a-5.2.0-2.zip",
+              "checksum": "SHA-256:c00dbdab8e8acc273d4aa319a74f7bb1d9496c843159823201d685359174168f",
+              "size": "76346909"
             },
             {
               "host": "x86_64-apple-darwin",
diff --git a/platform.txt b/platform.txt
index 09261111..34c90861 100644
--- a/platform.txt
+++ b/platform.txt
@@ -1,9 +1,10 @@
-
 name=ESP32 Arduino
 version=0.0.1
 
 runtime.tools.xtensa-esp32-elf-gcc.path={runtime.platform.path}/tools/xtensa-esp32-elf
-runtime.tools.esptool.path={runtime.platform.path}/tools/esptool.py
+
+tools.esptool.cmd=python "{runtime.platform.path}/tools/esptool.py"
+tools.esptool.cmd.windows=python.exe "{runtime.platform.path}/tools/esptool.py"
 
 compiler.warning_flags=-w
 compiler.warning_flags.none=-w
@@ -33,14 +34,8 @@ compiler.as.cmd=xtensa-esp32-elf-as
 compiler.ar.cmd=xtensa-esp32-elf-ar
 compiler.ar.flags=cru
 
-compiler.elf2hex.cmd=esptool.py
-compiler.elf2hex.flags=
-
 compiler.size.cmd=xtensa-esp32-elf-size
 
-compiler.python.cmd=python
-compiler.python.cmd.windows=python.exe
-
 # This can be overriden in boards.txt
 build.extra_flags=-DESP32
 
@@ -72,7 +67,7 @@ recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.f
 recipe.objcopy.eep.pattern=
 
 ## Create hex
-recipe.objcopy.hex.pattern="{compiler.python.cmd}" "{runtime.platform.path}/tools/esptool.py" --chip esp32 elf2image --flash_mode "{build.flash_mode}" --flash_freq "{build.flash_freq}" --flash_size "{build.flash_size}" -o "{build.path}/{build.project_name}.bin" "{build.path}/{build.project_name}.elf"
+recipe.objcopy.hex.pattern={tools.esptool.cmd} --chip esp32 elf2image --flash_mode "{build.flash_mode}" --flash_freq "{build.flash_freq}" --flash_size "{build.flash_size}" -o "{build.path}/{build.project_name}.bin" "{build.path}/{build.project_name}.elf"
 
 ## Save hex
 recipe.output.tmp_file={build.project_name}.bin
@@ -85,13 +80,7 @@ recipe.size.regex.data=^(?:\.dram0\.data|\.dram0\.bss)\s+([0-9]+).*
 
 # ------------------------------
 
-tools.esptool.cmd=python
-tools.esptool.cmd.windows=python.exe
-tools.esptool.path={runtime.platform.path}/tools/esptool.py
-tools.esptool.network_cmd=python
-tools.esptool.network_cmd.windows=python.exe
-
 tools.esptool.upload.protocol=esp32
 tools.esptool.upload.params.verbose=
 tools.esptool.upload.params.quiet=
-tools.esptool.upload.pattern="{cmd}" "{path}" --chip esp32 --port "{serial.port}" --baud {upload.speed} write_flash -z --flash_freq {build.flash_freq} --flash_mode {build.flash_mode} --flash_size {build.flash_size} 0x1000 "{runtime.platform.path}/tools/sdk/bin/bootloader.bin" 0x8000 "{runtime.platform.path}/tools/sdk/bin/partitions_singleapp.bin" 0x10000 "{build.path}/{build.project_name}.bin"
+tools.esptool.upload.pattern={cmd} --chip esp32 --port "{serial.port}" --baud {upload.speed} write_flash -z --flash_freq {build.flash_freq} --flash_mode {build.flash_mode} --flash_size {build.flash_size} 0x1000 "{runtime.platform.path}/tools/sdk/bin/bootloader.bin" 0x8000 "{runtime.platform.path}/tools/sdk/bin/partitions_singleapp.bin" 0x10000 "{build.path}/{build.project_name}.bin"