Fix kill cleanup order