SSP-2661 eliminate duplicate destroy methods