removed some macros