Gen2 Preflight support
Remove unneeded files