Macro cleanup