diff --git a/BUILD b/BUILD
index 35c1531..93e3622 100644
--- a/BUILD
+++ b/BUILD
@@ -18,7 +18,7 @@
     "buildifier_test",
 )
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 exports_files(
     ["tsconfig.json"],
diff --git a/pw_allocator/BUILD b/pw_allocator/BUILD
index 1d36d76..71f255c 100644
--- a/pw_allocator/BUILD
+++ b/pw_allocator/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "block",
diff --git a/pw_analog/BUILD b/pw_analog/BUILD
index 0d9c7ae..c048d8f 100644
--- a/pw_analog/BUILD
+++ b/pw_analog/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "analog_input",
diff --git a/pw_arduino_build/BUILD b/pw_arduino_build/BUILD
index a66ce62..29e210a 100644
--- a/pw_arduino_build/BUILD
+++ b/pw_arduino_build/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_arduino_build",
diff --git a/pw_assert/BUILD b/pw_assert/BUILD
index dff4701..8b18131 100644
--- a/pw_assert/BUILD
+++ b/pw_assert/BUILD
@@ -21,7 +21,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_facade(
     name = "facade",
diff --git a/pw_assert_basic/BUILD b/pw_assert_basic/BUILD
index 9992d77..95f5a5b 100644
--- a/pw_assert_basic/BUILD
+++ b/pw_assert_basic/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "headers",
diff --git a/pw_assert_log/BUILD b/pw_assert_log/BUILD
index fa2eb93..a978f07 100644
--- a/pw_assert_log/BUILD
+++ b/pw_assert_log/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "headers",
diff --git a/pw_base64/BUILD b/pw_base64/BUILD
index d1ea9af..20c7b0d 100644
--- a/pw_base64/BUILD
+++ b/pw_base64/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_base64",
diff --git a/pw_bloat/examples/BUILD b/pw_bloat/examples/BUILD
index 5edf70b..0fea6ad 100644
--- a/pw_bloat/examples/BUILD
+++ b/pw_bloat/examples/BUILD
@@ -16,7 +16,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_binary(
     name = "simple_base",
diff --git a/pw_blob_store/BUILD b/pw_blob_store/BUILD
index c426cd9..e4dc714 100644
--- a/pw_blob_store/BUILD
+++ b/pw_blob_store/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_blob_store",
diff --git a/pw_blob_store/size_report/BUILD b/pw_blob_store/size_report/BUILD
index ca27d3f..25063e8 100644
--- a/pw_blob_store/size_report/BUILD
+++ b/pw_blob_store/size_report/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_binary(
     name = "base",
diff --git a/pw_boot_armv7m/BUILD b/pw_boot_armv7m/BUILD
index 52f7901..8f6ee31 100644
--- a/pw_boot_armv7m/BUILD
+++ b/pw_boot_armv7m/BUILD
@@ -18,7 +18,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_boot_armv7m",
diff --git a/pw_build/BUILD b/pw_build/BUILD
index b98df6a..2761227 100644
--- a/pw_build/BUILD
+++ b/pw_build/BUILD
@@ -14,7 +14,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 config_setting(
     name = "kythe",
diff --git a/pw_bytes/BUILD b/pw_bytes/BUILD
index 293ae83..f9cdfbf 100644
--- a/pw_bytes/BUILD
+++ b/pw_bytes/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_bytes",
diff --git a/pw_bytes/size_report/BUILD b/pw_bytes/size_report/BUILD
index 957c29b..201b0a6 100644
--- a/pw_bytes/size_report/BUILD
+++ b/pw_bytes/size_report/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_binary(
     name = "build_byte_buffer",
diff --git a/pw_checksum/BUILD b/pw_checksum/BUILD
index 5ac4a4c..b939761 100644
--- a/pw_checksum/BUILD
+++ b/pw_checksum/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_checksum",
diff --git a/pw_chrono/BUILD b/pw_chrono/BUILD
index eb1f183..50d1fb2 100644
--- a/pw_chrono/BUILD
+++ b/pw_chrono/BUILD
@@ -21,7 +21,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "epoch",
diff --git a/pw_chrono_embos/BUILD b/pw_chrono_embos/BUILD
index f0d01a8..9248d51 100644
--- a/pw_chrono_embos/BUILD
+++ b/pw_chrono_embos/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "system_clock_headers",
diff --git a/pw_chrono_freertos/BUILD b/pw_chrono_freertos/BUILD
index 1b71337..6148a9b 100644
--- a/pw_chrono_freertos/BUILD
+++ b/pw_chrono_freertos/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "system_clock_headers",
diff --git a/pw_chrono_stl/BUILD b/pw_chrono_stl/BUILD
index 7637a49..b48eff8 100644
--- a/pw_chrono_stl/BUILD
+++ b/pw_chrono_stl/BUILD
@@ -23,7 +23,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "system_clock_headers",
diff --git a/pw_chrono_threadx/BUILD b/pw_chrono_threadx/BUILD
index ad0d83d..8a5dafe 100644
--- a/pw_chrono_threadx/BUILD
+++ b/pw_chrono_threadx/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "system_clock_headers",
diff --git a/pw_containers/BUILD b/pw_containers/BUILD
index d2030d4..c3e9000 100644
--- a/pw_containers/BUILD
+++ b/pw_containers/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_containers",
diff --git a/pw_cpu_exception/BUILD b/pw_cpu_exception/BUILD
index d58a55c..4a53ea6 100644
--- a/pw_cpu_exception/BUILD
+++ b/pw_cpu_exception/BUILD
@@ -14,7 +14,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 filegroup(
     name = "pw_cpu_exception",
diff --git a/pw_cpu_exception_cortex_m/BUILD b/pw_cpu_exception_cortex_m/BUILD
index ed71379..d8aa02f 100644
--- a/pw_cpu_exception_cortex_m/BUILD
+++ b/pw_cpu_exception_cortex_m/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "support_armv7m",
diff --git a/pw_docgen/BUILD b/pw_docgen/BUILD
index 85a5ca0..7bb1810 100644
--- a/pw_docgen/BUILD
+++ b/pw_docgen/BUILD
@@ -14,4 +14,4 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
diff --git a/pw_doctor/BUILD b/pw_doctor/BUILD
index 85a5ca0..7bb1810 100644
--- a/pw_doctor/BUILD
+++ b/pw_doctor/BUILD
@@ -14,4 +14,4 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
diff --git a/pw_function/BUILD b/pw_function/BUILD
index 768cc3c..273ae58 100644
--- a/pw_function/BUILD
+++ b/pw_function/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "config",
diff --git a/pw_function/size_report/BUILD b/pw_function/size_report/BUILD
index 072ec6f..dfe5829 100644
--- a/pw_function/size_report/BUILD
+++ b/pw_function/size_report/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_binary(
     name = "pointer_base",
diff --git a/pw_hdlc/BUILD b/pw_hdlc/BUILD
index 9463dbc..26c2c8c 100644
--- a/pw_hdlc/BUILD
+++ b/pw_hdlc/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_hdlc",
diff --git a/pw_hex_dump/BUILD b/pw_hex_dump/BUILD
index 9398c4b..eb234bf 100644
--- a/pw_hex_dump/BUILD
+++ b/pw_hex_dump/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_hex_dump",
diff --git a/pw_i2c/BUILD b/pw_i2c/BUILD
index 592e466..cd97bfb 100644
--- a/pw_i2c/BUILD
+++ b/pw_i2c/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "address",
diff --git a/pw_interrupt/BUILD b/pw_interrupt/BUILD
index 9b6135b..5379e06 100644
--- a/pw_interrupt/BUILD
+++ b/pw_interrupt/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_facade(
     name = "context_facade",
diff --git a/pw_interrupt_cortex_m/BUILD b/pw_interrupt_cortex_m/BUILD
index 579a1e5..711a218 100644
--- a/pw_interrupt_cortex_m/BUILD
+++ b/pw_interrupt_cortex_m/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "context_armv7m_headers",
diff --git a/pw_kvs/BUILD b/pw_kvs/BUILD
index 3a1680b..6a3da51 100644
--- a/pw_kvs/BUILD
+++ b/pw_kvs/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_kvs",
diff --git a/pw_kvs/size_report/BUILD b/pw_kvs/size_report/BUILD
index 3dc48b4..45f3435 100644
--- a/pw_kvs/size_report/BUILD
+++ b/pw_kvs/size_report/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_binary(
     name = "base",
diff --git a/pw_libc/BUILD b/pw_libc/BUILD
index 3131801..0139ae7 100644
--- a/pw_libc/BUILD
+++ b/pw_libc/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_test(
     name = "memset_test",
diff --git a/pw_log/BUILD b/pw_log/BUILD
index 8157c9e..4763d06 100644
--- a/pw_log/BUILD
+++ b/pw_log/BUILD
@@ -21,7 +21,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_facade(
     name = "facade",
diff --git a/pw_log_basic/BUILD b/pw_log_basic/BUILD
index 2c4598d..1b21fc8 100644
--- a/pw_log_basic/BUILD
+++ b/pw_log_basic/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "headers",
diff --git a/pw_log_multisink/BUILD b/pw_log_multisink/BUILD
index 8b87b64..68654f2 100644
--- a/pw_log_multisink/BUILD
+++ b/pw_log_multisink/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_log_queue",
diff --git a/pw_log_null/BUILD b/pw_log_null/BUILD
index d376559..0e5fe5a 100644
--- a/pw_log_null/BUILD
+++ b/pw_log_null/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "headers",
diff --git a/pw_log_rpc/BUILD b/pw_log_rpc/BUILD
index 2acb090..84ca7cb 100644
--- a/pw_log_rpc/BUILD
+++ b/pw_log_rpc/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_logs",
diff --git a/pw_log_sink/BUILD b/pw_log_sink/BUILD
index f10373d..51fda82 100644
--- a/pw_log_sink/BUILD
+++ b/pw_log_sink/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_log_sink",
diff --git a/pw_log_tokenized/BUILD b/pw_log_tokenized/BUILD
index 80b841d..5ac34a6 100644
--- a/pw_log_tokenized/BUILD
+++ b/pw_log_tokenized/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "headers",
diff --git a/pw_malloc/BUILD b/pw_malloc/BUILD
index d29726a..b4c9169 100644
--- a/pw_malloc/BUILD
+++ b/pw_malloc/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_facade(
     name = "facade",
diff --git a/pw_malloc_freelist/BUILD b/pw_malloc_freelist/BUILD
index c0aaa11..b3e40d5 100644
--- a/pw_malloc_freelist/BUILD
+++ b/pw_malloc_freelist/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "headers",
diff --git a/pw_metric/BUILD b/pw_metric/BUILD
index 50a0343..10b0203 100644
--- a/pw_metric/BUILD
+++ b/pw_metric/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "metric",
diff --git a/pw_metric/size_report/BUILD b/pw_metric/size_report/BUILD
index 2b53929..e8275d7 100644
--- a/pw_metric/size_report/BUILD
+++ b/pw_metric/size_report/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_binary(
     name = "base",
diff --git a/pw_minimal_cpp_stdlib/BUILD b/pw_minimal_cpp_stdlib/BUILD
index 01d6276..644af1a 100644
--- a/pw_minimal_cpp_stdlib/BUILD
+++ b/pw_minimal_cpp_stdlib/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_minimal_cpp_stdlib",
diff --git a/pw_multisink/BUILD b/pw_multisink/BUILD
index 1a33643..df68796 100644
--- a/pw_multisink/BUILD
+++ b/pw_multisink/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_multisink",
diff --git a/pw_persistent_ram/BUILD b/pw_persistent_ram/BUILD
index e1e89c4..46ca6f1 100644
--- a/pw_persistent_ram/BUILD
+++ b/pw_persistent_ram/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_persistent_ram",
diff --git a/pw_persistent_ram/size_report/BUILD b/pw_persistent_ram/size_report/BUILD
index 11f4091..614cd3b 100644
--- a/pw_persistent_ram/size_report/BUILD
+++ b/pw_persistent_ram/size_report/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_binary(
     name = "persistent",
diff --git a/pw_polyfill/BUILD b/pw_polyfill/BUILD
index 1b2f74d..d12a6b2 100644
--- a/pw_polyfill/BUILD
+++ b/pw_polyfill/BUILD
@@ -25,7 +25,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 cc_injected_toolchain_header_library(
     name = "toolchain_injected_headers",
diff --git a/pw_preprocessor/BUILD b/pw_preprocessor/BUILD
index 46494d1..2b00bd3 100644
--- a/pw_preprocessor/BUILD
+++ b/pw_preprocessor/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_preprocessor",
diff --git a/pw_protobuf_compiler/BUILD b/pw_protobuf_compiler/BUILD
index 34b516e..83486c1 100644
--- a/pw_protobuf_compiler/BUILD
+++ b/pw_protobuf_compiler/BUILD
@@ -14,7 +14,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 # TODO(frolv): Figure out how to support nanopb codegen in Bazel.
 filegroup(
diff --git a/pw_random/BUILD b/pw_random/BUILD
index d571850..4ffda3b 100644
--- a/pw_random/BUILD
+++ b/pw_random/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_random",
diff --git a/pw_result/BUILD b/pw_result/BUILD
index 7566d23..b17f321 100644
--- a/pw_result/BUILD
+++ b/pw_result/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_result",
diff --git a/pw_result/size_report/BUILD b/pw_result/size_report/BUILD
index 1c31ed8..fd41185 100644
--- a/pw_result/size_report/BUILD
+++ b/pw_result/size_report/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_binary(
     name = "pointer_simple",
diff --git a/pw_ring_buffer/BUILD b/pw_ring_buffer/BUILD
index b4af4e3..1e079d9 100644
--- a/pw_ring_buffer/BUILD
+++ b/pw_ring_buffer/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_ring_buffer",
diff --git a/pw_ring_buffer/size_report/BUILD b/pw_ring_buffer/size_report/BUILD
index 8339bc5..b05b576 100644
--- a/pw_ring_buffer/size_report/BUILD
+++ b/pw_ring_buffer/size_report/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_binary(
     name = "ring_buffer_simple",
diff --git a/pw_router/BUILD b/pw_router/BUILD
index b284aff..c643d43 100644
--- a/pw_router/BUILD
+++ b/pw_router/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "static_router",
diff --git a/pw_router/size_report/BUILD b/pw_router/size_report/BUILD
index f90c83b..3ca9437 100644
--- a/pw_router/size_report/BUILD
+++ b/pw_router/size_report/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_binary(
     name = "base",
diff --git a/pw_rpc/size_report/BUILD b/pw_rpc/size_report/BUILD
index e4e46ca..e1a5ffa 100644
--- a/pw_rpc/size_report/BUILD
+++ b/pw_rpc/size_report/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_binary(
     name = "base",
diff --git a/pw_snapshot/BUILD b/pw_snapshot/BUILD
index 558a444..24f0c74 100644
--- a/pw_snapshot/BUILD
+++ b/pw_snapshot/BUILD
@@ -14,7 +14,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 proto_library(
     name = "metadata_proto",
diff --git a/pw_span/BUILD b/pw_span/BUILD
index 6788a6b..103822e 100644
--- a/pw_span/BUILD
+++ b/pw_span/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_span",
diff --git a/pw_status/BUILD b/pw_status/BUILD
index 170626f..2d2c2c9 100644
--- a/pw_status/BUILD
+++ b/pw_status/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_status",
diff --git a/pw_stream/BUILD b/pw_stream/BUILD
index 39de473..c6ca213 100644
--- a/pw_stream/BUILD
+++ b/pw_stream/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_stream",
diff --git a/pw_string/BUILD b/pw_string/BUILD
index a46a5f4..d7e959a 100644
--- a/pw_string/BUILD
+++ b/pw_string/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_string",
diff --git a/pw_string/size_report/BUILD b/pw_string/size_report/BUILD
index 7c6b474..21c7737 100644
--- a/pw_string/size_report/BUILD
+++ b/pw_string/size_report/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_binary(
     name = "single_write_snprintf",
diff --git a/pw_sync/BUILD b/pw_sync/BUILD
index a575299..5687165 100644
--- a/pw_sync/BUILD
+++ b/pw_sync/BUILD
@@ -25,7 +25,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_facade(
     name = "binary_semaphore_facade",
diff --git a/pw_sync_baremetal/BUILD b/pw_sync_baremetal/BUILD
index f3eeb51..e23c3c7 100644
--- a/pw_sync_baremetal/BUILD
+++ b/pw_sync_baremetal/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "interrupt_spin_lock_headers",
diff --git a/pw_sync_embos/BUILD b/pw_sync_embos/BUILD
index d03e39c..23ad1ff 100644
--- a/pw_sync_embos/BUILD
+++ b/pw_sync_embos/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "binary_semaphore_headers",
diff --git a/pw_sync_freertos/BUILD b/pw_sync_freertos/BUILD
index ed0c7c1..5faf553 100644
--- a/pw_sync_freertos/BUILD
+++ b/pw_sync_freertos/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "binary_semaphore_headers",
diff --git a/pw_sync_stl/BUILD b/pw_sync_stl/BUILD
index 8235f15..2d5113b 100644
--- a/pw_sync_stl/BUILD
+++ b/pw_sync_stl/BUILD
@@ -23,7 +23,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "binary_semaphore_headers",
diff --git a/pw_sync_threadx/BUILD b/pw_sync_threadx/BUILD
index ca58c46..96b3abf 100644
--- a/pw_sync_threadx/BUILD
+++ b/pw_sync_threadx/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "binary_semaphore_headers",
diff --git a/pw_sys_io_arduino/BUILD b/pw_sys_io_arduino/BUILD
index 22f116d..08e64b0 100644
--- a/pw_sys_io_arduino/BUILD
+++ b/pw_sys_io_arduino/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_sys_io_arduino",
diff --git a/pw_sys_io_baremetal_lm3s6965evb/BUILD b/pw_sys_io_baremetal_lm3s6965evb/BUILD
index 6e6dc73..6bcb866 100644
--- a/pw_sys_io_baremetal_lm3s6965evb/BUILD
+++ b/pw_sys_io_baremetal_lm3s6965evb/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_sys_io_baremetal_lm3s6965evb",
diff --git a/pw_sys_io_baremetal_stm32f429/BUILD b/pw_sys_io_baremetal_stm32f429/BUILD
index 9edd4e6..d48a7cb 100644
--- a/pw_sys_io_baremetal_stm32f429/BUILD
+++ b/pw_sys_io_baremetal_stm32f429/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_sys_io_baremetal_stm32f429",
diff --git a/pw_sys_io_stdio/BUILD b/pw_sys_io_stdio/BUILD
index 6741bbb..23d5103 100644
--- a/pw_sys_io_stdio/BUILD
+++ b/pw_sys_io_stdio/BUILD
@@ -23,7 +23,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_sys_io_stdio",
diff --git a/pw_thread/BUILD b/pw_thread/BUILD
index 828ccc9..3590e3e 100644
--- a/pw_thread/BUILD
+++ b/pw_thread/BUILD
@@ -21,7 +21,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_facade(
     name = "id_facade",
diff --git a/pw_thread_embos/BUILD b/pw_thread_embos/BUILD
index d0a23e2..f8d41e2 100644
--- a/pw_thread_embos/BUILD
+++ b/pw_thread_embos/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "id_headers",
diff --git a/pw_thread_freertos/BUILD b/pw_thread_freertos/BUILD
index c36ba6d..d82d563 100644
--- a/pw_thread_freertos/BUILD
+++ b/pw_thread_freertos/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "id_headers",
diff --git a/pw_thread_stl/BUILD b/pw_thread_stl/BUILD
index 0555a08..91837a0 100644
--- a/pw_thread_stl/BUILD
+++ b/pw_thread_stl/BUILD
@@ -24,7 +24,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "id_headers",
diff --git a/pw_thread_threadx/BUILD b/pw_thread_threadx/BUILD
index f69e160..924f13d 100644
--- a/pw_thread_threadx/BUILD
+++ b/pw_thread_threadx/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "id_headers",
diff --git a/pw_tls_client/BUILD b/pw_tls_client/BUILD
index 5b06962..cc8f82d 100644
--- a/pw_tls_client/BUILD
+++ b/pw_tls_client/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_facade(
     name = "pw_tls_client_facade",
diff --git a/pw_tokenizer/BUILD b/pw_tokenizer/BUILD
index 49d2eea..d06d209 100644
--- a/pw_tokenizer/BUILD
+++ b/pw_tokenizer/BUILD
@@ -22,7 +22,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_tokenizer",
diff --git a/pw_tool/BUILD b/pw_tool/BUILD
index c561a34..2b6af38 100644
--- a/pw_tool/BUILD
+++ b/pw_tool/BUILD
@@ -17,7 +17,7 @@
     "pw_cc_binary",
 )
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_binary(
     name = "pw_tool",
diff --git a/pw_toolchain/BUILD b/pw_toolchain/BUILD
index 85a5ca0..7bb1810 100644
--- a/pw_toolchain/BUILD
+++ b/pw_toolchain/BUILD
@@ -14,4 +14,4 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
diff --git a/pw_trace/BUILD b/pw_trace/BUILD
index cbd5be0..e0b7725 100644
--- a/pw_trace/BUILD
+++ b/pw_trace/BUILD
@@ -21,7 +21,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 # TODO(pwbug/101): Need to add support for facades/backends to Bazel.
 
diff --git a/pw_trace_tokenized/BUILD b/pw_trace_tokenized/BUILD
index c9dd954..1a273af 100644
--- a/pw_trace_tokenized/BUILD
+++ b/pw_trace_tokenized/BUILD
@@ -21,7 +21,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 # TODO(pwbug/101): Need to add support for facades/backends to Bazel.
 
diff --git a/pw_unit_test/BUILD b/pw_unit_test/BUILD
index 312efde..2e5790c 100644
--- a/pw_unit_test/BUILD
+++ b/pw_unit_test/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "config",
diff --git a/pw_varint/BUILD b/pw_varint/BUILD
index e4e35be..7c6a0b0 100644
--- a/pw_varint/BUILD
+++ b/pw_varint/BUILD
@@ -20,7 +20,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pw_varint",
diff --git a/targets/arduino/BUILD b/targets/arduino/BUILD
index c351de2..fcfb660 100644
--- a/targets/arduino/BUILD
+++ b/targets/arduino/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pre_init",
diff --git a/targets/host/BUILD b/targets/host/BUILD
index 307a463..58446b8 100644
--- a/targets/host/BUILD
+++ b/targets/host/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "system_rpc_server",
diff --git a/targets/lm3s6965evb_qemu/BUILD b/targets/lm3s6965evb_qemu/BUILD
index eb05f9c..88ef8ab 100644
--- a/targets/lm3s6965evb_qemu/BUILD
+++ b/targets/lm3s6965evb_qemu/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pre_init",
diff --git a/targets/stm32f429i_disc1/BUILD b/targets/stm32f429i_disc1/BUILD
index 623f7b7..74198fb 100644
--- a/targets/stm32f429i_disc1/BUILD
+++ b/targets/stm32f429i_disc1/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "pre_init",
diff --git a/third_party/arduino/BUILD b/third_party/arduino/BUILD
index 2aff0f1..75de8d2 100644
--- a/third_party/arduino/BUILD
+++ b/third_party/arduino/BUILD
@@ -14,4 +14,4 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
diff --git a/third_party/stm32cube/BUILD b/third_party/stm32cube/BUILD
index 0441357..81a3ff7 100644
--- a/third_party/stm32cube/BUILD
+++ b/third_party/stm32cube/BUILD
@@ -19,7 +19,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache License 2.0
+licenses(["notice"])
 
 pw_cc_library(
     name = "stm32cube",