diff --git a/cores/esp32/Arduino.h b/cores/esp32/Arduino.h
index 53f07a6f..e66e2ea3 100644
--- a/cores/esp32/Arduino.h
+++ b/cores/esp32/Arduino.h
@@ -117,9 +117,6 @@ typedef uint8_t byte;
 typedef unsigned int word;
 
 #ifdef __cplusplus
-void setup(void);
-void loop(void);
-
 long random(long, long);
 #endif
 void randomSeed(unsigned long);
@@ -129,10 +126,6 @@ long map(long, long, long, long, long);
 extern "C" {
 #endif
 
-void init(void);
-void initVariant(void);
-void initArduino(void);
-
 unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout);
 unsigned long pulseInLong(uint8_t pin, uint8_t state, unsigned long timeout);
 
diff --git a/cores/esp32/HardwareSerial.h b/cores/esp32/HardwareSerial.h
index ec66accf..0fdb1c41 100644
--- a/cores/esp32/HardwareSerial.h
+++ b/cores/esp32/HardwareSerial.h
@@ -110,8 +110,6 @@ protected:
     uint8_t _rx_pin;
 };
 
-extern void serialEventRun(void) __attribute__((weak));
-
 #if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_SERIAL)
 #ifndef ARDUINO_SERIAL_PORT
 #define ARDUINO_SERIAL_PORT 0
diff --git a/cores/esp32/esp32-hal-misc.c b/cores/esp32/esp32-hal-misc.c
index 4be22160..2602c287 100644
--- a/cores/esp32/esp32-hal-misc.c
+++ b/cores/esp32/esp32-hal-misc.c
@@ -21,9 +21,6 @@
 #include "esp_partition.h"
 #include "esp_log.h"
 #include "esp_timer.h"
-#ifdef CONFIG_APP_ROLLBACK_ENABLE
-#include "esp_ota_ops.h"
-#endif //CONFIG_APP_ROLLBACK_ENABLE
 #ifdef CONFIG_BT_ENABLED
 #include "esp_bt.h"
 #endif //CONFIG_BT_ENABLED
@@ -63,86 +60,6 @@ void __yield()
 
 void yield() __attribute__ ((weak, alias("__yield")));
 
-#if CONFIG_AUTOSTART_ARDUINO
-
-extern TaskHandle_t loopTaskHandle;
-extern bool loopTaskWDTEnabled;
-
-void enableLoopWDT(){
-    if(loopTaskHandle != NULL){
-        if(esp_task_wdt_add(loopTaskHandle) != ESP_OK){
-            log_e("Failed to add loop task to WDT");
-        } else {
-            loopTaskWDTEnabled = true;
-        }
-    }
-}
-
-void disableLoopWDT(){
-    if(loopTaskHandle != NULL && loopTaskWDTEnabled){
-        loopTaskWDTEnabled = false;
-        if(esp_task_wdt_delete(loopTaskHandle) != ESP_OK){
-            log_e("Failed to remove loop task from WDT");
-        }
-    }
-}
-
-void feedLoopWDT(){
-    esp_err_t err = esp_task_wdt_reset();
-    if(err != ESP_OK){
-        log_e("Failed to feed WDT! Error: %d", err);
-    }
-}
-#endif
-
-void enableCore0WDT(){
-    TaskHandle_t idle_0 = xTaskGetIdleTaskHandleForCPU(0);
-    if(idle_0 == NULL || esp_task_wdt_add(idle_0) != ESP_OK){
-        log_e("Failed to add Core 0 IDLE task to WDT");
-    }
-}
-
-void disableCore0WDT(){
-    TaskHandle_t idle_0 = xTaskGetIdleTaskHandleForCPU(0);
-    if(idle_0 == NULL || esp_task_wdt_delete(idle_0) != ESP_OK){
-        log_e("Failed to remove Core 0 IDLE task from WDT");
-    }
-}
-
-#ifndef CONFIG_FREERTOS_UNICORE
-void enableCore1WDT(){
-    TaskHandle_t idle_1 = xTaskGetIdleTaskHandleForCPU(1);
-    if(idle_1 == NULL || esp_task_wdt_add(idle_1) != ESP_OK){
-        log_e("Failed to add Core 1 IDLE task to WDT");
-    }
-}
-
-void disableCore1WDT(){
-    TaskHandle_t idle_1 = xTaskGetIdleTaskHandleForCPU(1);
-    if(idle_1 == NULL || esp_task_wdt_delete(idle_1) != ESP_OK){
-        log_e("Failed to remove Core 1 IDLE task from WDT");
-    }
-}
-#endif
-
-BaseType_t xTaskCreateUniversal( TaskFunction_t pxTaskCode,
-                        const char * const pcName,
-                        const uint32_t usStackDepth,
-                        void * const pvParameters,
-                        UBaseType_t uxPriority,
-                        TaskHandle_t * const pxCreatedTask,
-                        const BaseType_t xCoreID ){
-#ifndef CONFIG_FREERTOS_UNICORE
-    if(xCoreID >= 0 && xCoreID < 2) {
-        return xTaskCreatePinnedToCore(pxTaskCode, pcName, usStackDepth, pvParameters, uxPriority, pxCreatedTask, xCoreID);
-    } else {
-#endif
-    return xTaskCreate(pxTaskCode, pcName, usStackDepth, pvParameters, uxPriority, pxCreatedTask);
-#ifndef CONFIG_FREERTOS_UNICORE
-    }
-#endif
-}
-
 unsigned long ARDUINO_ISR_ATTR micros()
 {
     return (unsigned long) (esp_timer_get_time());
@@ -174,70 +91,6 @@ void ARDUINO_ISR_ATTR delayMicroseconds(uint32_t us)
     }
 }
 
-void initVariant() __attribute__((weak));
-void initVariant() {}
-
-void init() __attribute__((weak));
-void init() {}
-
-bool verifyOta() __attribute__((weak));
-bool verifyOta() { return true; }
-
-#ifdef CONFIG_BT_ENABLED
-//overwritten in esp32-hal-bt.c
-bool btInUse() __attribute__((weak));
-bool btInUse(){ return false; }
-#endif
-
-void initArduino()
-{
-#ifdef CONFIG_APP_ROLLBACK_ENABLE
-    const esp_partition_t *running = esp_ota_get_running_partition();
-    esp_ota_img_states_t ota_state;
-    if (esp_ota_get_state_partition(running, &ota_state) == ESP_OK) {
-        if (ota_state == ESP_OTA_IMG_PENDING_VERIFY) {
-            if (verifyOta()) {
-                esp_ota_mark_app_valid_cancel_rollback();
-            } else {
-                log_e("OTA verification failed! Start rollback to the previous version ...");
-                esp_ota_mark_app_invalid_rollback_and_reboot();
-            }
-        }
-    }
-#endif
-    //init proper ref tick value for PLL (uncomment if REF_TICK is different than 1MHz)
-    //ESP_REG(APB_CTRL_PLL_TICK_CONF_REG) = APB_CLK_FREQ / REF_CLK_FREQ - 1;
-#ifdef F_CPU
-    setCpuFrequencyMhz(F_CPU/1000000);
-#endif
-#if CONFIG_SPIRAM_SUPPORT || CONFIG_SPIRAM
-    psramInit();
-#endif
-    esp_log_level_set("*", CONFIG_LOG_DEFAULT_LEVEL);
-    esp_err_t err = nvs_flash_init();
-    if(err == ESP_ERR_NVS_NO_FREE_PAGES){
-        const esp_partition_t* partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_NVS, NULL);
-        if (partition != NULL) {
-            err = esp_partition_erase_range(partition, 0, partition->size);
-            if(!err){
-                err = nvs_flash_init();
-            } else {
-                log_e("Failed to format the broken NVS partition!");
-            }
-        }
-    }
-    if(err) {
-        log_e("Failed to initialize NVS! Error: %u", err);
-    }
-#ifdef CONFIG_BT_ENABLED
-    if(!btInUse()){
-        esp_bt_controller_mem_release(ESP_BT_MODE_BTDM);
-    }
-#endif
-    init();
-    initVariant();
-}
-
 //used by hal log
 const char * ARDUINO_ISR_ATTR pathToFileName(const char * path)
 {
diff --git a/cores/esp32/esp32-hal.h b/cores/esp32/esp32-hal.h
index 92bb1828..731ba4e4 100644
--- a/cores/esp32/esp32-hal.h
+++ b/cores/esp32/esp32-hal.h
@@ -88,46 +88,11 @@ void yield(void);
 //returns chip temperature in Celsius
 float temperatureRead();
 
-#if CONFIG_AUTOSTART_ARDUINO
-//enable/disable WDT for Arduino's setup and loop functions
-void enableLoopWDT();
-void disableLoopWDT();
-//feed WDT for the loop task
-void feedLoopWDT();
-#endif
-
-//enable/disable WDT for the IDLE task on Core 0 (SYSTEM)
-void enableCore0WDT();
-void disableCore0WDT();
-#ifndef CONFIG_FREERTOS_UNICORE
-//enable/disable WDT for the IDLE task on Core 1 (Arduino)
-void enableCore1WDT();
-void disableCore1WDT();
-#endif
-
-//if xCoreID < 0 or CPU is unicore, it will use xTaskCreate, else xTaskCreatePinnedToCore
-//allows to easily handle all possible situations without repetitive code
-BaseType_t xTaskCreateUniversal( TaskFunction_t pxTaskCode,
-                        const char * const pcName,
-                        const uint32_t usStackDepth,
-                        void * const pvParameters,
-                        UBaseType_t uxPriority,
-                        TaskHandle_t * const pxCreatedTask,
-                        const BaseType_t xCoreID );
-
 unsigned long micros();
 unsigned long millis();
 void delay(uint32_t);
 void delayMicroseconds(uint32_t us);
 
-#if !CONFIG_ESP32_PHY_AUTO_INIT
-void arduino_phy_init();
-#endif
-
-#if !CONFIG_AUTOSTART_ARDUINO
-void initArduino();
-#endif
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/cores/esp32/main.cpp b/cores/esp32/main.cpp
deleted file mode 100644
index ba41e0fd..00000000
--- a/cores/esp32/main.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
-#include "esp_task_wdt.h"
-#include "Arduino.h"
-#if ARDUINO_SERIAL_PORT //Serial used for USB CDC
-#include "USB.h"
-#endif
-
-TaskHandle_t loopTaskHandle = NULL;
-
-#if CONFIG_AUTOSTART_ARDUINO
-#if CONFIG_FREERTOS_UNICORE
-void yieldIfNecessary(void){
-    static uint64_t lastYield = 0;
-    uint64_t now = millis();
-    if((now - lastYield) > 2000) {
-        lastYield = now;
-        vTaskDelay(5); //delay 1 RTOS tick
-    }
-}
-#endif
-
-bool loopTaskWDTEnabled;
-
-void loopTask(void *pvParameters)
-{
-    setup();
-    for(;;) {
-#if CONFIG_FREERTOS_UNICORE
-        yieldIfNecessary();
-#endif
-        if(loopTaskWDTEnabled){
-            esp_task_wdt_reset();
-        }
-        loop();
-        if (serialEventRun) serialEventRun();
-    }
-}
-
-extern "C" void app_main()
-{
-#if ARDUINO_SERIAL_PORT //Serial used for USB CDC
-    USB.begin();
-#endif
-    loopTaskWDTEnabled = false;
-    initArduino();
-    xTaskCreateUniversal(loopTask, "loopTask", 8192, NULL, 1, &loopTaskHandle, ARDUINO_RUNNING_CORE);
-}
-
-#endif
diff --git a/libraries/SPIFFS/src/SPIFFS.cpp b/libraries/SPIFFS/src/SPIFFS.cpp
index d3e16654..cfa6f96c 100644
--- a/libraries/SPIFFS/src/SPIFFS.cpp
+++ b/libraries/SPIFFS/src/SPIFFS.cpp
@@ -107,10 +107,9 @@ void SPIFFSFS::end()
 
 bool SPIFFSFS::format()
 {
-    disableCore0WDT();
     esp_err_t err = esp_spiffs_format(partitionLabel_);
-    enableCore0WDT();
-    if(err){
+    if (err)
+    {
         log_e("Formatting SPIFFS failed! Error: %d", err);
         return false;
     }