fix cleanup order / more verbose about timeout