diff --git a/arch/xtensa/src/common/xtensa_exit.c b/arch/xtensa/src/common/xtensa_exit.c
index 0352a4d8f5d..9d54bf9edea 100644
--- a/arch/xtensa/src/common/xtensa_exit.c
+++ b/arch/xtensa/src/common/xtensa_exit.c
@@ -179,7 +179,7 @@ void _exit(int status)
 
   xtensa_full_context_restore(tcb->xcp.regs);
 
-  /* up_fullcontextrestore() should not return but could if the software
+  /* xtensa_full_context_restore() should not return but could if the software
    * interrupts are disabled.
    */
 
diff --git a/configs/Kconfig b/configs/Kconfig
index e61761409fe..9385de296bd 100644
--- a/configs/Kconfig
+++ b/configs/Kconfig
@@ -173,7 +173,6 @@ config ARCH_BOARD_EKKLM3S9B96
 config ARCH_BOARD_ESP32CORE
 	bool "Expressif ESP32 Core board V2"
 	depends on ARCH_CHIP_ESP32
-	select ARCH_HAVE_LEDS
 	---help---
 		The ESP32 is a dual-core system from Expressif with two Harvard
 		architecture Xtensa LX6 CPUs. All embedded memory, external memory
diff --git a/configs/esp32-core/README.txt b/configs/esp32-core/README.txt
index 2b8278dab35..50fd2d273d3 100644
--- a/configs/esp32-core/README.txt
+++ b/configs/esp32-core/README.txt
@@ -84,35 +84,20 @@ Serial Console
 Buttons and LEDs
 ================
 
-  NOTE: As of this writing, I have no schematic for the ESP32 Core board.
-  The following information derives only from examining the parts visible
-  on the board.
-
   Buttons
   -------
-  I see two buttons labelled Boot and EN.  I suspect that neither is
-  available to software.
+  There are two buttons labeled Boot and EN.  The EN button is not available
+  to software.  It pulls the chip enable line that doubles as a reset line.
+
+  The BOOT button is connected to IO0.  On reset it is used as a strapping
+  pin to determine whether the chip boots normally or into the serial
+  bootloader.  After reset, however, the BOOT button can be used for software
+  input.
 
   LEDs
-  A single LED labelled D1 is available.
-
-  When CONFIG_ARCH_LEDS is defined in the NuttX configuration, NuttX will
-  control the LED as follows:
-
-    SYMBOL              Meaning                 LED
-    ------------------- ----------------------- ------
-    LED_STARTED         NuttX has been started  OFF
-    LED_HEAPALLOCATE    Heap has been allocated OFF
-    LED_IRQSENABLED     Interrupts enabled      OFF
-    LED_STACKCREATED    Idle stack created      ON
-    LED_INIRQ           In an interrupt         N/C
-    LED_SIGNAL          In a signal handler     N/C
-    LED_ASSERTION       An assertion failed     N/C
-    LED_PANIC           The system has crashed  FLASH
-
-  Thus is LED is statically on, NuttX has successfully  booted and is,
-  apparently, running normally.  If LED is flashing at approximately
-  2Hz, then a fatal error has been detected and the system has halted.
+  ----
+  There are several on-board LEDs for that indicate the presence of power
+  and USB activity.  None of these are available for use by sofware.
 
 Configurations
 ==============
diff --git a/configs/esp32-core/include/board.h b/configs/esp32-core/include/board.h
index 2a82eb16e82..678a3c1e5e4 100644
--- a/configs/esp32-core/include/board.h
+++ b/configs/esp32-core/include/board.h
@@ -40,25 +40,4 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* A single LED labelled D1 is available.
- *
- *  When CONFIG_ARCH_LEDS is defined in the NuttX configuration, NuttX will
- *  control the LED as follows:
- *
- *    SYMBOL              Value Meaning                 LED
- *    ------------------- ----- ----------------------- ------ */
-#define LED_STARTED        0   /* NuttX has been started  OFF */
-#define LED_HEAPALLOCATE   0   /* Heap has been allocated OFF */
-#define LED_IRQSENABLED    0   /* Interrupts enabled      OFF */
-#define LED_STACKCREATED   1   /* Idle stack created      ON */
-#define LED_INIRQ          2   /* In an interrupt         N/C */
-#define LED_SIGNAL         2   /* In a signal handler     N/C */
-#define LED_ASSERTION      2   /* An assertion failed     N/C */
-#define LED_PANIC          3   /* The system has crashed  FLASH */
-
-/* Thus if the LED is statically on, NuttX has successfully  booted and is,
- * apparently, running normally.  If LED is flashing at approximately
- * 2Hz, then a fatal error has been detected and the system has halted.
- */
-
 #endif /* __CONFIGS_ESP32_CORE_INCLUDE_BOARD_H */
diff --git a/configs/esp32-core/nsh/defconfig b/configs/esp32-core/nsh/defconfig
index 6e1935c244b..67a5268ab14 100644
--- a/configs/esp32-core/nsh/defconfig
+++ b/configs/esp32-core/nsh/defconfig
@@ -75,9 +75,6 @@ CONFIG_ARCH_CHIP="esp32"
 CONFIG_ARCH_CHIP_ESP32=y
 CONFIG_ARCH_FAMILY_LX6=y
 CONFIG_XTENSA_NCOPROCESSORS=1
-CONFIG_XTENSA_INT_NLEVELS=5
-CONFIG_XTENSA_EXCM_LEVEL=3
-# CONFIG_XTENSA_HAVE_LOOPS is not set
 CONFIG_XTENSA_HAVE_INTERRUPTS=y
 # CONFIG_XTENSA_USE_SWPRI is not set
 CONFIG_XTENSA_CALL0_ABI=y
@@ -149,8 +146,6 @@ CONFIG_ARCH_BOARD="esp32-core"
 #
 # Common Board Options
 #
-CONFIG_ARCH_HAVE_LEDS=y
-CONFIG_ARCH_LEDS=y
 
 #
 # Board-Specific Options
@@ -324,7 +319,6 @@ CONFIG_SPI_EXCHANGE=y
 #
 # LED Support
 #
-# CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
 # CONFIG_NCP5623C is not set