SSP-1529 Remove duplicate destroy() methods