Change list comprehension to generator
Remove mnt-efi function