Modified destroy method