Fix destroy method calls