so much cleanup, also more Grub MB checking