Override destroy more correctly