massive macro cleanup