MacroSpec cleanup