Saw out old unused macros