SM-12639 Cleanup