adjust cleanup order