Last references to obsolete BOOTLOADER definition removed