More robust destroy method