Removed some macros