Remove dependency on macros when publish