Removed Macros