Fix args and remove data in 'destroy' method