Bootloader module cleanup

ok, will add it