removed necessary macros