diff --git a/src/applications/bmqstoragetool/m_bmqstoragetool_filemanager.cpp b/src/applications/bmqstoragetool/m_bmqstoragetool_filemanager.cpp
index 0971e7076..3d0552e40 100644
--- a/src/applications/bmqstoragetool/m_bmqstoragetool_filemanager.cpp
+++ b/src/applications/bmqstoragetool/m_bmqstoragetool_filemanager.cpp
@@ -60,7 +60,7 @@ void closeLedger(mqbsl::Ledger* ledger)
 }  // close unnamed namespace
 
 // =====================
-// class FileManagerReal
+// class FileManagerImpl
 // =====================
 
 // CREATORS
@@ -220,7 +220,7 @@ QueueMap FileManagerImpl::buildQueueMap(const bsl::string& cslFile,
 }
 
 // ==================================
-// class FileManagerReal::FileHandler
+// class FileManagerImpl::FileHandler
 // ==================================
 
 template <typename ITER>
diff --git a/src/applications/bmqtool/m_bmqtool_interactive.cpp b/src/applications/bmqtool/m_bmqtool_interactive.cpp
index ccedb1dd9..9d1f71919 100644
--- a/src/applications/bmqtool/m_bmqtool_interactive.cpp
+++ b/src/applications/bmqtool/m_bmqtool_interactive.cpp
@@ -50,8 +50,6 @@ namespace m_bmqtool {
 
 namespace {
 
-const char k_LOG_CATEGORY[] = "APPLICATION";
-
 /// Print to stdout the specified `message` prefixed by the specified
 /// `prefix`.
 void printMessage(bsl::ostream& out, int index, const bmqa::Message& message)
diff --git a/src/groups/bmq/bmqp/bmqp_compression.h b/src/groups/bmq/bmqp/bmqp_compression.h
index 7984b0128..ba36c89ea 100644
--- a/src/groups/bmq/bmqp/bmqp_compression.h
+++ b/src/groups/bmq/bmqp/bmqp_compression.h
@@ -146,4 +146,4 @@ struct Compression_Impl {
 }  // close package namespace
 }  // close enterprise namespace
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/groups/mqb/mqbblp/mqbblp_clustercatalog.cpp b/src/groups/mqb/mqbblp/mqbblp_clustercatalog.cpp
index ed3296ab2..6c81d96c2 100644
--- a/src/groups/mqb/mqbblp/mqbblp_clustercatalog.cpp
+++ b/src/groups/mqb/mqbblp/mqbblp_clustercatalog.cpp
@@ -50,10 +50,6 @@
 namespace BloombergLP {
 namespace mqbblp {
 
-namespace {
-const char k_LOG_CATEGORY[] = "MQBBLP.CLUSTERCATALOG";
-}  // close unnamed namespace
-
 // --------------------
 // class ClusterCatalog
 // --------------------
diff --git a/src/groups/mqb/mqbc/mqbc_partitionfsmobserver.h b/src/groups/mqb/mqbc/mqbc_partitionfsmobserver.h
index c97fb208a..0e70234b8 100644
--- a/src/groups/mqb/mqbc/mqbc_partitionfsmobserver.h
+++ b/src/groups/mqb/mqbc/mqbc_partitionfsmobserver.h
@@ -67,4 +67,4 @@ class PartitionFSMObserver {
 }  // close package namespace
 }  // close enterprise namespace
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/groups/mwc/mwctsk/mwctsk_logcontroller.cpp b/src/groups/mwc/mwctsk/mwctsk_logcontroller.cpp
index 147bfcdb0..fcdf594e2 100644
--- a/src/groups/mwc/mwctsk/mwctsk_logcontroller.cpp
+++ b/src/groups/mwc/mwctsk/mwctsk_logcontroller.cpp
@@ -77,11 +77,10 @@ void printCategoryWithDelimiter(const bsl::shared_ptr<bsl::ostream>& os,
     *os << "\n";
 }
 
-static void
-bslsLogHandler(BSLS_ANNOTATION_UNUSED bsls::LogSeverity::Enum severity,
-               const char*                                    file,
-               int                                            line,
-               const char*                                    message)
+static void bslsLogHandler(bsls::LogSeverity::Enum severity,
+                           const char*             file,
+                           int                     line,
+                           const char*             message)
 {
     // Custom message handler for bsls::Log.  Redirect the specified
     // 'message', the specified 'file' and the specified 'line' to
@@ -122,8 +121,6 @@ LogControllerConfig::balToBslsLogLevel(ball::Severity::Level level)
     case ball::Severity::e_TRACE: return bsls::LogSeverity::e_TRACE;
     default: return bsls::LogSeverity::e_ERROR;
     };
-
-    return bsls::LogSeverity::e_ERROR;
 }
 
 LogControllerConfig::CategoryProperties::CategoryProperties(