Get rid of macros