Added extract switch to PFS, cleaning utils in UEFI.