Remove redundant SSM macros