removed double macros