shake out some unused macros