diff --git a/src/control/cmd/daos_agent/procmon.go b/src/control/cmd/daos_agent/procmon.go
index 8ce634f7612..2c832d7ab36 100644
--- a/src/control/cmd/daos_agent/procmon.go
+++ b/src/control/cmd/daos_agent/procmon.go
@@ -2,7 +2,7 @@
 // (C) Copyright 2020-2021 Intel Corporation.
 //
 // SPDX-License-Identifier: BSD-2-Clause-Patent
-// portions thereof marked with this legend must also reproduce the markings.
+//
 
 package main
 
diff --git a/src/control/cmd/dmg/json_test.go b/src/control/cmd/dmg/json_test.go
index 779206b15bc..0d75b5d4deb 100644
--- a/src/control/cmd/dmg/json_test.go
+++ b/src/control/cmd/dmg/json_test.go
@@ -2,7 +2,7 @@
 // (C) Copyright 2020-2021 Intel Corporation.
 //
 // SPDX-License-Identifier: BSD-2-Clause-Patent
-// portions thereof marked with this legend must also reproduce the markings.
+//
 
 package main
 
diff --git a/src/control/drpc/drpc_server.go b/src/control/drpc/drpc_server.go
index 7e36a66f589..4650c004f61 100644
--- a/src/control/drpc/drpc_server.go
+++ b/src/control/drpc/drpc_server.go
@@ -2,7 +2,7 @@
 // (C) Copyright 2018-2021 Intel Corporation.
 //
 // SPDX-License-Identifier: BSD-2-Clause-Patent
-// portions thereof marked with this legend must also reproduce the markings.
+//
 
 package drpc
 
diff --git a/src/control/drpc/drpc_server_test.go b/src/control/drpc/drpc_server_test.go
index eb11f5e8c31..15f12a34192 100644
--- a/src/control/drpc/drpc_server_test.go
+++ b/src/control/drpc/drpc_server_test.go
@@ -2,7 +2,7 @@
 // (C) Copyright 2019-2021 Intel Corporation.
 //
 // SPDX-License-Identifier: BSD-2-Clause-Patent
-// portions thereof marked with this legend must also reproduce the markings.
+//
 
 package drpc
 
diff --git a/src/control/drpc/failure.go b/src/control/drpc/failure.go
index 024d54a078e..ed22233f2d8 100644
--- a/src/control/drpc/failure.go
+++ b/src/control/drpc/failure.go
@@ -2,7 +2,7 @@
 // (C) Copyright 2018-2021 Intel Corporation.
 //
 // SPDX-License-Identifier: BSD-2-Clause-Patent
-// portions thereof marked with this legend must also reproduce the markings.
+//
 
 package drpc
 
diff --git a/src/control/drpc/failure_test.go b/src/control/drpc/failure_test.go
index 666f2c6d1bb..875eeafdaba 100644
--- a/src/control/drpc/failure_test.go
+++ b/src/control/drpc/failure_test.go
@@ -2,7 +2,7 @@
 // (C) Copyright 2019-2021 Intel Corporation.
 //
 // SPDX-License-Identifier: BSD-2-Clause-Patent
-// portions thereof marked with this legend must also reproduce the markings.
+//
 
 package drpc
 
diff --git a/src/control/drpc/mocks_test.go b/src/control/drpc/mocks_test.go
index 94e479926c9..55a707ccdf8 100644
--- a/src/control/drpc/mocks_test.go
+++ b/src/control/drpc/mocks_test.go
@@ -2,7 +2,7 @@
 // (C) Copyright 2019-2021 Intel Corporation.
 //
 // SPDX-License-Identifier: BSD-2-Clause-Patent
-// portions thereof marked with this legend must also reproduce the markings.
+//
 
 package drpc
 
diff --git a/src/control/drpc/module_svc.go b/src/control/drpc/module_svc.go
index 6d533816967..7c5a8658dba 100644
--- a/src/control/drpc/module_svc.go
+++ b/src/control/drpc/module_svc.go
@@ -2,7 +2,7 @@
 // (C) Copyright 2018-2021 Intel Corporation.
 //
 // SPDX-License-Identifier: BSD-2-Clause-Patent
-// portions thereof marked with this legend must also reproduce the markings.
+//
 
 package drpc
 
diff --git a/src/control/drpc/module_svc_test.go b/src/control/drpc/module_svc_test.go
index 9ba177b9194..d9d0102b9c2 100644
--- a/src/control/drpc/module_svc_test.go
+++ b/src/control/drpc/module_svc_test.go
@@ -2,7 +2,7 @@
 // (C) Copyright 2019-2021 Intel Corporation.
 //
 // SPDX-License-Identifier: BSD-2-Clause-Patent
-// portions thereof marked with this legend must also reproduce the markings.
+//
 
 package drpc
 
diff --git a/src/control/lib/txtfmt/writer.go b/src/control/lib/txtfmt/writer.go
index fd493641222..001f16449cc 100644
--- a/src/control/lib/txtfmt/writer.go
+++ b/src/control/lib/txtfmt/writer.go
@@ -2,7 +2,7 @@
 // (C) Copyright 2020-2021 Intel Corporation.
 //
 // SPDX-License-Identifier: BSD-2-Clause-Patent
-// portions thereof marked with this legend must also reproduce the markings.
+//
 
 package txtfmt