Better server tear-down