remove some macros