diff --git a/lib/NeoESP32RmtHI/include/NeoEsp32RmtHIMethod.h b/lib/NeoESP32RmtHI/include/NeoEsp32RmtHIMethod.h
index 0e4f7111..30396229 100644
--- a/lib/NeoESP32RmtHI/include/NeoEsp32RmtHIMethod.h
+++ b/lib/NeoESP32RmtHI/include/NeoEsp32RmtHIMethod.h
@@ -466,97 +466,4 @@ typedef NeoEsp32Rmt7Ws2805InvertedMethod NeoEsp32RmtHI7Ws2814InvertedMethod;
 #endif // !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32S3)
 #endif // !defined(CONFIG_IDF_TARGET_ESP32C3)
 
-
-#if defined(NEOPIXEL_ESP32_RMT_DEFAULT) || defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3)
-
-// Normally I2s method is the default, defining NEOPIXEL_ESP32_RMT_DEFAULT
-// will switch to use RMT as the default method
-// The ESP32S2, ESP32S3, and ESP32C3 will always defualt to RMT
-
-#if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3)
-
-// RMT channel 1 method is the default method for ESP32S2, ESP32S3, and ESP32C3
-typedef NeoEsp32Rmt1Ws2812xMethod NeoWs2813Method;
-typedef NeoEsp32Rmt1Ws2812xMethod NeoWs2812xMethod;
-typedef NeoEsp32Rmt1800KbpsMethod NeoWs2812Method;
-typedef NeoEsp32Rmt1Ws2812xMethod NeoWs2811Method;
-typedef NeoEsp32Rmt1Ws2812xMethod NeoWs2816Method;
-typedef NeoEsp32Rmt1Ws2805Method NeoWs2805Method;
-typedef NeoEsp32Rmt1Ws2814Method NeoWs2814Method;
-typedef NeoEsp32Rmt1Sk6812Method NeoSk6812Method;
-typedef NeoEsp32Rmt1Tm1814Method NeoTm1814Method;
-typedef NeoEsp32Rmt1Tm1829Method NeoTm1829Method;
-typedef NeoEsp32Rmt1Tm1914Method NeoTm1914Method;
-typedef NeoEsp32Rmt1Sk6812Method NeoLc8812Method;
-typedef NeoEsp32Rmt1Apa106Method NeoApa106Method;
-typedef NeoEsp32Rmt1Tx1812Method NeoTx1812Method;
-typedef NeoEsp32Rmt1Gs1903Method NeoGs1903Method;
-
-typedef NeoEsp32Rmt1Ws2812xMethod Neo800KbpsMethod;
-typedef NeoEsp32Rmt1400KbpsMethod Neo400KbpsMethod;
-
-typedef NeoEsp32Rmt1Ws2812xInvertedMethod NeoWs2813InvertedMethod;
-typedef NeoEsp32Rmt1Ws2812xInvertedMethod NeoWs2812xInvertedMethod;
-typedef NeoEsp32Rmt1Ws2812xInvertedMethod NeoWs2811InvertedMethod;
-typedef NeoEsp32Rmt1800KbpsInvertedMethod NeoWs2812InvertedMethod;
-typedef NeoEsp32Rmt1Ws2812xInvertedMethod NeoWs2816InvertedMethod;
-typedef NeoEsp32Rmt1Ws2805InvertedMethod NeoWs2805InvertedMethod;
-typedef NeoEsp32Rmt1Ws2814InvertedMethod NeoWs2814InvertedMethod;
-typedef NeoEsp32Rmt1Sk6812InvertedMethod NeoSk6812InvertedMethod;
-typedef NeoEsp32Rmt1Tm1814InvertedMethod NeoTm1814InvertedMethod;
-typedef NeoEsp32Rmt1Tm1829InvertedMethod NeoTm1829InvertedMethod;
-typedef NeoEsp32Rmt1Tm1914InvertedMethod NeoTm1914InvertedMethod;
-typedef NeoEsp32Rmt1Sk6812InvertedMethod NeoLc8812InvertedMethod;
-typedef NeoEsp32Rmt1Apa106InvertedMethod NeoApa106InvertedMethod;
-typedef NeoEsp32Rmt1Tx1812InvertedMethod NeoTx1812InvertedMethod;
-typedef NeoEsp32Rmt1Gs1903InvertedMethod NeoGs1903InvertedMethod;
-
-typedef NeoEsp32Rmt1Ws2812xInvertedMethod Neo800KbpsInvertedMethod;
-typedef NeoEsp32Rmt1400KbpsInvertedMethod Neo400KbpsInvertedMethod;
-
-#else // defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3)
-
-// RMT channel 6 method is the default method for Esp32
-typedef NeoEsp32Rmt6Ws2812xMethod NeoWs2813Method;
-typedef NeoEsp32Rmt6Ws2812xMethod NeoWs2812xMethod;
-typedef NeoEsp32Rmt6800KbpsMethod NeoWs2812Method;
-typedef NeoEsp32Rmt6Ws2812xMethod NeoWs2811Method;
-typedef NeoEsp32Rmt6Ws2812xMethod NeoWs2816Method;
-typedef NeoEsp32Rmt6Ws2805Method NeoWs2805Method;
-typedef NeoEsp32Rmt6Ws2814Method NeoWs2814Method;
-typedef NeoEsp32Rmt6Sk6812Method NeoSk6812Method;
-typedef NeoEsp32Rmt6Tm1814Method NeoTm1814Method;
-typedef NeoEsp32Rmt6Tm1829Method NeoTm1829Method;
-typedef NeoEsp32Rmt6Tm1914Method NeoTm1914Method;
-typedef NeoEsp32Rmt6Sk6812Method NeoLc8812Method;
-typedef NeoEsp32Rmt6Apa106Method NeoApa106Method;
-typedef NeoEsp32Rmt6Tx1812Method NeoTx1812Method;
-typedef NeoEsp32Rmt6Gs1903Method NeoGs1903Method;
-
-typedef NeoEsp32Rmt6Ws2812xMethod Neo800KbpsMethod;
-typedef NeoEsp32Rmt6400KbpsMethod Neo400KbpsMethod;
-
-typedef NeoEsp32Rmt6Ws2812xInvertedMethod NeoWs2813InvertedMethod;
-typedef NeoEsp32Rmt6Ws2812xInvertedMethod NeoWs2812xInvertedMethod;
-typedef NeoEsp32Rmt6Ws2812xInvertedMethod NeoWs2811InvertedMethod;
-typedef NeoEsp32Rmt6800KbpsInvertedMethod NeoWs2812InvertedMethod;
-typedef NeoEsp32Rmt6Ws2812xInvertedMethod NeoWs2816InvertedMethod;
-typedef NeoEsp32Rmt6Ws2805InvertedMethod NeoWs2805InvertedMethod;
-typedef NeoEsp32Rmt6Ws2814InvertedMethod NeoWs2814InvertedMethod;
-typedef NeoEsp32Rmt6Sk6812InvertedMethod NeoSk6812InvertedMethod;
-typedef NeoEsp32Rmt6Tm1814InvertedMethod NeoTm1814InvertedMethod;
-typedef NeoEsp32Rmt6Tm1829InvertedMethod NeoTm1829InvertedMethod;
-typedef NeoEsp32Rmt6Tm1914InvertedMethod NeoTm1914InvertedMethod;
-typedef NeoEsp32Rmt6Sk6812InvertedMethod NeoLc8812InvertedMethod;
-typedef NeoEsp32Rmt6Apa106InvertedMethod NeoApa106InvertedMethod;
-typedef NeoEsp32Rmt6Tx1812InvertedMethod NeoTx1812InvertedMethod;
-typedef NeoEsp32Rmt6Gs1903InvertedMethod NeoGs1903InvertedMethod;
-
-typedef NeoEsp32Rmt6Ws2812xInvertedMethod Neo800KbpsInvertedMethod;
-typedef NeoEsp32Rmt6400KbpsInvertedMethod Neo400KbpsInvertedMethod;
-
-#endif // defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32C3)
-
-#endif // defined(NEOPIXEL_ESP32_RMT_DEFAULT) || defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32C3)
-
 #endif