TODO comment added
more libgrub cleanup