sync bootloader's cleanups with master