macros cleanup