diff --git a/src/usb/uf2/ghostfat.c b/src/usb/uf2/ghostfat.c
index 5c7b6c9..d7e3da8 100644
--- a/src/usb/uf2/ghostfat.c
+++ b/src/usb/uf2/ghostfat.c
@@ -363,12 +363,7 @@ void read_block(uint32_t block_no, uint8_t *data) {
                 bl->targetAddr = addr;
                 bl->payloadSize = UF2_FIRMWARE_BYTES_PER_SECTOR;
                 bl->flags = UF2_FLAG_FAMILYID;
-
-#if defined(CFG_UF2_BOARD_APP_ID) && CFG_UF2_BOARD_APP_ID
                 bl->familyID = CFG_UF2_BOARD_APP_ID;
-#else
-                bl->familyID = CFG_UF2_FAMILY_APP_ID;
-#endif
                 memcpy(bl->data, (void *)addr, bl->payloadSize);
             }
         }
diff --git a/src/usb/uf2/uf2cfg.h b/src/usb/uf2/uf2cfg.h
index 3d1bffa..f17305a 100644
--- a/src/usb/uf2/uf2cfg.h
+++ b/src/usb/uf2/uf2cfg.h
@@ -1,10 +1,10 @@
 #include "boards.h"
 #include "dfu_types.h"
 
-// Legacy Family ID for updating Application
+// Family ID for updating generic Application
 #define CFG_UF2_FAMILY_APP_ID     0xADA52840
 
-// Family ID for board-specific Application
+// Board-specific ID for board-specific Application
 #if defined(USB_DESC_VID) && defined(USB_DESC_UF2_PID) && USB_DESC_VID && USB_DESC_UF2_PID
     #define CFG_UF2_BOARD_APP_ID      ((USB_DESC_VID << 16) | USB_DESC_UF2_PID)
 #endif