Macros removed from core