Simplify grub2 misc

agree