Removed macros