[Finishes #60636676] Cleanup Job lifecycle