diff --git a/binfmt/binfmt_unregister.c b/binfmt/binfmt_unregister.c
index f97b06ff2d..e0a6fe80e6 100644
--- a/binfmt/binfmt_unregister.c
+++ b/binfmt/binfmt_unregister.c
@@ -50,22 +50,6 @@
 
 #ifndef CONFIG_BINFMT_DISABLE
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Function Prototypes
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
diff --git a/binfmt/builtin.c b/binfmt/builtin.c
index 88ad846c7f..fda996429f 100644
--- a/binfmt/builtin.c
+++ b/binfmt/builtin.c
@@ -195,7 +195,7 @@ int builtin_initialize(void)
 
 void builtin_uninitialize(void)
 {
-  unregister_binfmt(&g_builtin_binfmt);
+  (void)unregister_binfmt(&g_builtin_binfmt);
 }
 
 #endif /* CONFIG_BUILTIN */
diff --git a/binfmt/elf.c b/binfmt/elf.c
index 37b1e117cd..d4e227c26c 100644
--- a/binfmt/elf.c
+++ b/binfmt/elf.c
@@ -362,7 +362,7 @@ int elf_initialize(void)
 
 void elf_uninitialize(void)
 {
-  unregister_binfmt(&g_elfbinfmt);
+  (void)unregister_binfmt(&g_elfbinfmt);
 }
 
 #endif /* CONFIG_ELF */
diff --git a/binfmt/nxflat.c b/binfmt/nxflat.c
index c2f1c06f78..16fdc17e18 100644
--- a/binfmt/nxflat.c
+++ b/binfmt/nxflat.c
@@ -274,7 +274,7 @@ int nxflat_initialize(void)
 
 void nxflat_uninitialize(void)
 {
-  unregister_binfmt(&g_nxflatbinfmt);
+  (void)unregister_binfmt(&g_nxflatbinfmt);
 }
 
 #endif /* CONFIG_NXFLAT */
diff --git a/binfmt/pcode.c b/binfmt/pcode.c
index 7e38c14e9b..b8fc5aaf09 100644
--- a/binfmt/pcode.c
+++ b/binfmt/pcode.c
@@ -583,11 +583,7 @@ void pcode_uninitialize(void)
   ret = unregister_binfmt(&g_pcode_binfmt);
   if (ret < 0)
     {
-      int errval = get_errno();
-      DEBUGASSERT(errval > 0);
-
-      berr("ERROR: unregister_binfmt() failed: %d\n", errval);
-      UNUSED(errval);
+      berr("ERROR: unregister_binfmt() failed: %d\n", ret);
     }
 
 #ifdef CONFIG_BINFMT_PCODE_TEST_FS