SSP-2598 - combined new destroy method with unnoticed existing method