macro cleanup.