Removed unused macros