Re-work boot step cleanup handling