removed unused macros