Clean up the way a preflight is defined