clean up macros