mirror macro cleanup