Remove macros code