diff --git a/embassy-usb/src/builder.rs b/embassy-usb/src/builder.rs
index cad1ecda9..6b68bcd7b 100644
--- a/embassy-usb/src/builder.rs
+++ b/embassy-usb/src/builder.rs
@@ -207,15 +207,7 @@ impl<'d, D: Driver<'d>> Builder<'d, D> {
         info!("USB: bos_descriptor used: {}", self.bos_descriptor.writer.position());
         #[cfg(feature = "msos-descriptor")]
         info!("USB: msos_descriptor used: {}", msos_descriptor.len());
-        if self.control_buf.len() != self.config.max_packet_size_0.into() {
-            warn!(
-                "USB: Mismatch in control buf and max packet size! buf len: {}, max ep0 size: {}",
-                self.control_buf.len(),
-                self.config.max_packet_size_0,
-            );
-        } else {
-            info!("USB: control_buf size: {}", self.control_buf.len());
-        }
+        info!("USB: control_buf size: {}", self.control_buf.len());
 
         UsbDevice::build(
             self.driver,
diff --git a/embassy-usb/src/class/hid.rs b/embassy-usb/src/class/hid.rs
index 597403427..03e4c1dbb 100644
--- a/embassy-usb/src/class/hid.rs
+++ b/embassy-usb/src/class/hid.rs
@@ -458,8 +458,8 @@ impl<'d> Handler for Control<'d> {
             return None;
         }
 
-        // TODO(AJM): This uses a defmt-specific formatter that causes use of the `log`
-        // feature to fail to build
+        // This uses a defmt-specific formatter that causes use of the `log`
+        // feature to fail to build, so leave it defmt-specific for now.
         #[cfg(feature = "defmt")]
         trace!("HID control_out {:?} {=[u8]:x}", req, data);
         match req.request {