Merge "Remove unused destroy methods"