diff --git a/ompi/include/mpi.h.in b/ompi/include/mpi.h.in
index b9e6697a2b6..bac996c052d 100644
--- a/ompi/include/mpi.h.in
+++ b/ompi/include/mpi.h.in
@@ -22,8 +22,6 @@
  * Copyright (c) 2017-2019 IBM Corporation.  All rights reserved.
  * Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
  * Copyright (c) 2021      Google, LLC. All rights reserved.
- * Copyright (c) 2018      Triad National Security, LLC. All rights
- * Copyright (c) 2018-2019 Triad National Security, LLC. All rights
  * Copyright (c) 2018-2021 Triad National Security, LLC. All rights
  *                         reserved.
  * $COPYRIGHT$
diff --git a/ompi/mca/op/base/base.h b/ompi/mca/op/base/base.h
index ea284a0e6f2..f26992c23a5 100644
--- a/ompi/mca/op/base/base.h
+++ b/ompi/mca/op/base/base.h
@@ -45,6 +45,7 @@ typedef struct ompi_op_base_selected_module_t {
     ompi_op_base_module_t *op_module;
 } ompi_op_base_selected_module_t;
 
+
 /**
  * Find all available op components.
  */
diff --git a/opal/class/opal_object.h b/opal/class/opal_object.h
index f97df45e890..6b60726f1c3 100644
--- a/opal/class/opal_object.h
+++ b/opal/class/opal_object.h
@@ -15,7 +15,6 @@
  *                         and Technology (RIST).  All rights reserved.
  * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
  *                         reserved.
- *
  * $COPYRIGHT$
  * Additional copyrights may follow
  * $HEADER$
diff --git a/opal/datatype/opal_convertor.c b/opal/datatype/opal_convertor.c
index 6a7c947eeb3..e08265b42bc 100644
--- a/opal/datatype/opal_convertor.c
+++ b/opal/datatype/opal_convertor.c
@@ -585,9 +585,6 @@ int32_t opal_convertor_prepare_for_recv(opal_convertor_t *convertor,
 #endif
 
     assert(!(convertor->flags & CONVERTOR_SEND));
-    /*
-     * Note this macro may call return....
-     */
     OPAL_CONVERTOR_PREPARE(convertor, datatype, count, pUserBuf);
 
 #if defined(CHECKSUM)
diff --git a/opal/mca/pmix/base/pmix_base_fns.c b/opal/mca/pmix/base/pmix_base_fns.c
index 3b2df6a9ce2..eaeee0900f9 100644
--- a/opal/mca/pmix/base/pmix_base_fns.c
+++ b/opal/mca/pmix/base/pmix_base_fns.c
@@ -9,8 +9,6 @@
  *                         All rights reserved.
  * Copyright (c) 2016      Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2021      Nanook Consulting.  All rights reserved.
- * Copyright (c) 2020      Triad National Security, LLC. All rights
- *                         reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow