diff --git a/configs/teensy-2.0/src/at90usb_boot.c b/configs/teensy-2.0/src/at90usb_boot.c
index ad3379a42f0..93ce9a76ffe 100644
--- a/configs/teensy-2.0/src/at90usb_boot.c
+++ b/configs/teensy-2.0/src/at90usb_boot.c
@@ -49,14 +49,6 @@
 #include "at90usb.h"
 #include "teensy-20.h"
 
-/************************************************************************************
- * Pre-processor Definitions
- ************************************************************************************/
-
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -73,20 +65,20 @@
 
 void at90usb_boardinitialize(void)
 {
+#ifdef CONFIG_AVR_SPI
   /* Configure SSP chip selects if 1) at least one SSP is enabled, and 2) the weak
    * function at90usb_spidev_initialize() has been brought into the link.
    */
 
-#ifdef CONFIG_AVR_SPI
   if (at90usb_spidev_initialize)
     {
       at90usb_spidev_initialize();
     }
 #endif
 
+#ifdef CONFIG_ARCH_LEDS
   /* Configure on-board LEDs if LED support has been selected. */
 
-#ifdef CONFIG_ARCH_LEDS
   at90usb_led_initialize();
 #endif
 }
diff --git a/configs/teensy-2.0/src/at90usb_leds.c b/configs/teensy-2.0/src/at90usb_leds.c
index 30c62d110b7..ebe96f65bfb 100644
--- a/configs/teensy-2.0/src/at90usb_leds.c
+++ b/configs/teensy-2.0/src/at90usb_leds.c
@@ -57,19 +57,15 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
- * with CONFIG_DEBUG_INFO too)
- */
+/* CONFIG_DEBUG_LEDS enables debug output from this file */
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define lederr  llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define ledinfo llerr
-#  else
-#    define ledinfo(x...)
-#  endif
+#  define ledwarn llwarn
+#  define ledinfo llinfo
 #else
 #  define lederr(x...)
+#  define ledwarn(x...)
 #  define ledinfo(x...)
 #endif
 
@@ -79,10 +75,6 @@
 
 static bool g_ncoff;
 
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
diff --git a/configs/teensy-2.0/src/at90usb_usbmsc.c b/configs/teensy-2.0/src/at90usb_usbmsc.c
index d519c5d429c..9fbc1735b98 100644
--- a/configs/teensy-2.0/src/at90usb_usbmsc.c
+++ b/configs/teensy-2.0/src/at90usb_usbmsc.c
@@ -49,6 +49,7 @@
 #include <nuttx/mmcsd.h>
 #include <nuttx/spi/spi.h>
 
+#include "avr.h"
 #include "at90usb.h"
 #include "teensy-20.h"
 
@@ -62,17 +63,10 @@
 #  define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
 #endif
 
-/* PORT and SLOT number probably depend on the board configuration */
+/* MMC/SD PORT and SLOT number */
 
-#ifdef CONFIG_ARCH_BOARD_TEENSY_20
-#  undef AVR_MMCSDSPIPORTNO
-#  define AVR_MMCSDSPIPORTNO 0
-#  undef AVR_MMCSDSLOTNO
-#  define AVR_MMCSDSLOTNO 0
-#else
-   /* Add configuration for new AVR boards here */
-#  error "Unrecognized AVR board"
-#endif
+#define AVR_MMCSDSPIPORTNO 0
+#define AVR_MMCSDSLOTNO 0
 
 /****************************************************************************
  * Public Functions
diff --git a/configs/teensy-2.0/src/teensy-20.h b/configs/teensy-2.0/src/teensy-20.h
index ad1f2530bb6..16dbb086b13 100644
--- a/configs/teensy-2.0/src/teensy-20.h
+++ b/configs/teensy-2.0/src/teensy-20.h
@@ -43,24 +43,11 @@
 #include <nuttx/config.h>
 
 /****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-/* Configuration ************************************************************/
-
-/****************************************************************************
- * Public Types
+ * Public Function Prototypes
  ****************************************************************************/
 
 #ifndef __ASSEMBLY__
 
-/****************************************************************************
- * Inline Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
 #ifdef __cplusplus
 #define EXTERN extern "C"
 extern "C"