Changes to destroy method