Simplify grub2 misc

OK, will fix it