Preflight cleanup