Remove macros :)