Cleanup old unused macros