diff --git a/arch b/arch
index fb81d9d623..982356fab5 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit fb81d9d623c311e42128cfb026077db89bdec182
+Subproject commit 982356fab5364d3f70f54483394cec9cfe9b9199
diff --git a/configs b/configs
index 7a90dc6162..050dca048e 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit 7a90dc61627c97dc6e6b4cfd252288a91a821a09
+Subproject commit 050dca048e92cec8f8d04075553d75025a31f2d4
diff --git a/include/nuttx/module.h b/include/nuttx/module.h
index e08c92e592..be8859ec63 100644
--- a/include/nuttx/module.h
+++ b/include/nuttx/module.h
@@ -129,7 +129,7 @@ struct module_s
    * resources used by the loaded module.
    */
 
-  mod_uninitializer_t uninitializer;   /* Module initializer function */
+  mod_uninitializer_t uninitializer;   /* Module uninitializer function */
   FAR void *arg;                       /* Uninitializer argument */
   FAR void *alloc;                     /* Allocated kernel memory */
 };
diff --git a/sched/module/mod_bind.c b/sched/module/mod_bind.c
index 2fa71779ed..a2979664b7 100644
--- a/sched/module/mod_bind.c
+++ b/sched/module/mod_bind.c
@@ -51,28 +51,6 @@
 
 #include "module.h"
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/* CONFIG_DEBUG, CONFIG_DEBUG_VERBOSE, and CONFIG_MODULE_DUMPBUFFER have to
- * be defined or CONFIG_MODULE_DUMPBUFFER does nothing.
- */
-
-#if !defined(CONFIG_DEBUG_VERBOSE) || !defined (CONFIG_MODULE_DUMPBUFFER)
-#  undef CONFIG_MODULE_DUMPBUFFER
-#endif
-
-#ifndef CONFIG_MODULE_BUFFERSIZE
-#  define CONFIG_MODULE_BUFFERSIZE 128
-#endif
-
-#ifdef CONFIG_MODULE_DUMPBUFFER
-# define mod_dumpbuffer(m,b,n) svdbgdumpbuffer(m,b,n)
-#else
-# define mod_dumpbuffer(m,b,n)
-#endif
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/