Removing matching to Pantau EFOs + general updates.